#1227: Merge branch 'master' into v5

commit.ref

@@ -1 +1 @@
-Subproject commit 2ea518d7aef6f58608ec3f0c3b2ac54bb022f40c
+Subproject commit 86c904c6101087831029ce778f7113ca45622679

commit.yml

@@ -3,21 +3,108 @@ branches: {
   }
 fileChange:
   /application:
-    newFile: !uuid '2acb28fc3b534b6b649cdf055f9f1cd1b369cc60'
-    oldFile: !uuid 'fedb56170ccb63e8fd98196a78e18247b6e8c78d'
+    newFile: !uuid '4547224d54a760978be0c25138e4476ae8553dc9'
+    oldFile: !uuid '2acb28fc3b534b6b649cdf055f9f1cd1b369cc60'
   /application/admin:
-    newFile: !uuid '2a34560b8087258d4b080b696642543116e9cb45'
-    oldFile: !uuid '5334bc8be4a41c0a0d4a4543af892b0f7c913bd5'
+    newFile: !uuid 'c2365d726937e64c902d31bedc717276e259c2e0'
+    oldFile: !uuid '2a34560b8087258d4b080b696642543116e9cb45'
   /application/admin/controller:
-    newFile: !uuid '9d9b36ef5fdf7d119636e9b0dd34666f6106b795'
-    oldFile: !uuid '7b8c656418d3e5b2f32321d801135cd5d0f0d883'
+    newFile: !uuid 'f94d7ab119db800129f669bbe73a148fecaa8b37'
+    oldFile: !uuid '9d9b36ef5fdf7d119636e9b0dd34666f6106b795'
   /application/admin/controller/api:
-    newFile: !uuid '6ab65916ab03ebbd134a8c0bce03c2cb2567e100'
-    oldFile: !uuid '89e07025b08a587096ebdfacfbf8079fe68c4795'
+    newFile: !uuid 'ef70bb70e4c4d44f540e441f442ccf84733ed0b9'
+    oldFile: !uuid '6ab65916ab03ebbd134a8c0bce03c2cb2567e100'
+  /application/admin/controller/api/Plugs.php:
+    newFile: !uuid '5c6791e76ea99aa0dcc934071a05e2fb942593c8'
+    oldFile: !uuid 'f5501a10fb0c79c7b1f86381c543e0a136f46a54'
   /application/admin/controller/api/Update.php:
-    newFile: !uuid '96b9421122091968404abf53e7333ed3a79654cd'
-    oldFile: !uuid 'c460edbe628bccb248231f0bcb21f8bec2736557'
-gitCommitId: !uuid '2ea518d7aef6f58608ec3f0c3b2ac54bb022f40c'
+    newFile: !uuid 'bafad5c76f78b428fd026756cd9bba801a3f98f9'
+    oldFile: !uuid '96b9421122091968404abf53e7333ed3a79654cd'
+  /application/admin/service:
+    newFile: !uuid 'c46ea45fc882360874db64e997c96724318dc49f'
+    oldFile: !uuid '6a4cd24434d23d63d9af6ffadeed2ef96a699577'
+  /application/admin/service/NodeService.php:
+    newFile: !uuid 'd6a77e578cd16cefc8112bcf18a9ddb094dfdb2d'
+    oldFile: !uuid 'c0900fbf6e1fd3ee545883369811f5da180077b0'
+  /application/admin/view:
+    newFile: !uuid 'fd4a9dce89723593242cfc156c58cb36435ca381'
+    oldFile: !uuid '9bf280063b60dc52e5b0c5dc1592cc72ac59ad0f'
+  /application/admin/view/user:
+    newFile: !uuid 'c9fe5c4c37cf0da63a12b46de3bb30f416d1e7c0'
+    oldFile: !uuid '817a3915b814afe53492f2f3345ff722cd5dac67'
+  /application/admin/view/user/index_search.html:
+    newFile: !uuid 'b2d26a152199231f38223e530781821244a5ec88'
+    oldFile: !uuid '7cf0042aed2d4dca2d00648996bcfea95db7d46f'
+  /vendor:
+    newFile: !uuid 'bc4d9de8ecbbfdc45e27b8d7893c0f56bbf0a355'
+    oldFile: !uuid '1f25d50fb9a7a9ecb3521265c0c01080b72627ed'
+  /vendor/autoload.php:
+    newFile: !uuid 'f62f6cda4bfa854ef9e5118c6248c2f391846252'
+    oldFile: !uuid 'ec37f53f7373c43183564388adb644e6809ee263'
+  /vendor/composer:
+    newFile: !uuid 'b0a9c08e155711923aeee790648855d712e00c31'
+    oldFile: !uuid '306c5bf59ab64164f81118c0a012f988d87253c8'
+  /vendor/composer/autoload_real.php:
+    newFile: !uuid '74ca009bcabe774a723bc07ba2113fb7e048418c'
+    oldFile: !uuid '1da220454ac1a029aefe643f937f9f7d8ab1379d'
+  /vendor/composer/autoload_static.php:
+    newFile: !uuid '12fc72f07e7b26a5b7cd2f24f7a9e3c398a8eb81'
+    oldFile: !uuid 'dae97cc4d797a76c8492498da069772e30ca2645'
+  /vendor/composer/installed.json:
+    newFile: !uuid 'dac52f9dc1b53751b6227558406ccd3207035345'
+    oldFile: !uuid '1810efee9721792a2b060ec3667c992ae08f10f4'
+  /vendor/zoujingli:
+    newFile: !uuid '2171a94413df8662f1d3e9dcf23e5d65709ac5cb'
+    oldFile: !uuid '99b8d55985a0e6710cbffa52e804356d7ed42d72'
+  /vendor/zoujingli/think-library:
+    newFile: !uuid '9acb32542bded9bdf0db0393d828dfb0de37eccf'
+    oldFile: !uuid 'ca8c5caf954012112855a9eeefe16647cdbee26f'
+  /vendor/zoujingli/think-library/src:
+    newFile: !uuid '8a8554b3c2163f2339d97ada6e5c8ff40845b721'
+    oldFile: !uuid 'b2878a68f7c14c664740f01f7b5b6d88b11677c8'
+  /vendor/zoujingli/think-library/src/command:
+    newFile: !uuid '5f1e37dcd0df68fec34542944f94bf1a7c50b730'
+    oldFile: !uuid 'd799768395900ef865d592e9e8a4dcbcbf10c5c4'
+  /vendor/zoujingli/think-library/src/command/Sess.php:
+    newFile: !uuid 'eeb5775781bd62e1c17fb55c862af163368128a6'
+    oldFile: !uuid '7e6edd622f5209e49a3d2e0f04605f3dd2445e3b'
+  /vendor/zoujingli/think-library/src/command/Sync.php:
+    newFile: !uuid '74995692c81450c278ecb6825ca5cc09941f7289'
+    oldFile: !uuid '10aecc13e4ce25848f6c222aa31f2268fade4685'
+  /vendor/zoujingli/think-library/src/command/sync:
+    newFile: !uuid 'a53aafb26f7481b5b0cf099aac6ea2029d56ad12'
+    oldFile: !uuid '7e261d1ace82f25d6fa69cca5aebae52d40703ec'
+  /vendor/zoujingli/think-library/src/command/sync/Admin.php:
+    newFile: !uuid '695a93cd8f62b9e74111afbde7b6df60d33d36b6'
+    oldFile: !uuid '9c0d84971214770dd40a7e2faca5eb7f59882ec7'
+  /vendor/zoujingli/think-library/src/command/sync/Config.php:
+    newFile: !uuid 'a26b6d192e396a74a88f542c4dc2afe1f3572cb4'
+    oldFile: !uuid '2bb4d3765ce06a1dc45588f8326cdce8737cebab'
+  /vendor/zoujingli/think-library/src/command/sync/Plugs.php:
+    newFile: !uuid '4966009ed905d3331adc2c504caaec4a2ea9ef2e'
+    oldFile: !uuid 'a5b70136ef41641366a57a4758eae264ad6686ff'
+  /vendor/zoujingli/think-library/src/command/sync/Service.php:
+    newFile: !uuid 'a342ea558585a99abcd6615cec8174f1fb90d65f'
+    oldFile: !uuid 'd9f85a0185ebb679baecde7b4365fd122005b22e'
+  /vendor/zoujingli/think-library/src/command/sync/Wechat.php:
+    newFile: !uuid '903ef97308fc2e766c3a36af280255c8c208eaee'
+    oldFile: !uuid '8d0498b09a9da8712b5a3b2fa70105fe1d74f825'
+  /vendor/zoujingli/think-library/src/command/task:
+    newFile: !uuid '6f9300b3cb8bbcfe2824a3cf59fad7d9214604cc'
+    oldFile: !uuid '5bd916efdc240a933817287575142aac3d9de096'
+  /vendor/zoujingli/think-library/src/command/task/Reset.php:
+    newFile: !uuid '302a61b66a8c4854649b24f2bf2f670f60dad032'
+    oldFile: !uuid '7d0723838661cdfeabbfabf32636ebb34870e1ee'
+  /vendor/zoujingli/think-library/src/command/task/Start.php:
+    newFile: !uuid 'd6005e634a252ebd6589911e0ff56a250c8a6e5d'
+    oldFile: !uuid '0b203661b0cd4b5faa5d8e87a432d0cabdd8a8d7'
+  /vendor/zoujingli/think-library/src/command/task/State.php:
+    newFile: !uuid '63216450232f7835e9df2ccec04d4f2aff1aecf7'
+    oldFile: !uuid '9d8db33391d90ec85653e036584c299f75bb2b91'
+  /vendor/zoujingli/think-library/src/command/task/Stop.php:
+    newFile: !uuid 'f47c7ff84c2130742f0955f82fe2ad24f80b8734'
+    oldFile: !uuid '8c15ee375b3a78d43a95a6f3c35df65cb83714a1'
+gitCommitId: !uuid '86c904c6101087831029ce778f7113ca45622679'
 renames: {
   }
-revisionId: 1226
+revisionId: 1227