#1148: [更新]同步framework代码

commit.ref

@@ -1 +1 @@
-Subproject commit 4fa3cea59dd127a790b6c720400ac986d560dc5f
+Subproject commit 85f5f4e5523a9f001dbaec640746de41257530a2

commit.yml

@@ -2,52 +2,154 @@
 branches: {
   }
 fileChange:
-  /LICENSE.md:
-    newFile: !uuid '739ef00d8d7a63c353fce43af5c6ebed12500636'
-    oldFile: null
-  /README.md:
-    newFile: !uuid '8e85ceaf9659961888592f8612e20b4d19512f3d'
-    oldFile: !uuid '78fb560eb1befec49ea05995db8247273c2b7b5b'
-  /vendor:
-    newFile: !uuid '9490917fb65a3c785cf27a617ce6b5dac67ce069'
-    oldFile: !uuid '303e69a8c4d50e0ff14d8c02c9ba6790b27110e4'
-  /vendor/autoload.php:
-    newFile: !uuid '2fd7d13d54b3c8d8ca8862d49197170808c68484'
-    oldFile: !uuid 'b3a0d85003d034d61298ca34b53a35aa3aad343e'
-  /vendor/composer:
-    newFile: !uuid '4d51a936f27608d5bd8c4eee4d502f83523e674c'
-    oldFile: !uuid '4372e5240f07294f529e0791314d9d650f81b170'
-  /vendor/composer/autoload_real.php:
-    newFile: !uuid '923cbb6f71c8685987145b2671f76430f7fcb021'
-    oldFile: !uuid 'f17078a4b09cfb80e7762df402ea57b4d1deb897'
-  /vendor/composer/autoload_static.php:
-    newFile: !uuid 'fcc882debb28c73425b8a8a9c7d88d6c3eb4d35e'
-    oldFile: !uuid '7a10b0a1759f1255481428bf476b523149222e50'
-  /vendor/composer/installed.json:
-    newFile: !uuid 'ffc411b14095125687846c9f767f1b5edbd3bdbd'
-    oldFile: !uuid '50682a5c4a25f1fe633151ef57b4b09650ae6794'
-  /vendor/zoujingli:
-    newFile: !uuid 'b7ff64d17efd7b145e3e1f920e2ef022cdd1646f'
-    oldFile: !uuid 'db5b20c7c521a4192b568f0427b2cecfa1fd3c7e'
-  /vendor/zoujingli/think-library:
-    newFile: !uuid '77995f3071f5b9e758d6ee200e25dbf53c452884'
-    oldFile: !uuid '1c8821a588a7d99ebf55f5c65ce0e20ea9eb12f3'
-  /vendor/zoujingli/think-library/src:
-    newFile: !uuid '9c6a0d2bc74f91aff9e023a2c81892de4e0a1e09'
-    oldFile: !uuid 'bf16fb4683e92c5d8baee92e04228444a9a01d63'
-  /vendor/zoujingli/think-library/src/common.php:
-    newFile: !uuid 'c7205f56e23f8a07bb46d2ec69bff378498ee66f'
-    oldFile: !uuid '2acd45e6c69ddd814dc46389dd9057fee415c141'
-  /vendor/zoujingli/think-library/src/tools:
-    newFile: !uuid 'abf88a30767a16c870a309b8aa2ee1e57ec6a417'
-    oldFile: !uuid '580e29fb131b54b5218ba54a13a758aead03cc60'
-  /vendor/zoujingli/think-library/src/tools/Data.php:
-    newFile: !uuid '8b849a958cc29cb12267e9a052b8eed3dc111d65'
-    oldFile: !uuid '5e1a7d44039b3ec4b8e191799e32b5a92dd84ef6'
-  /vendor/zoujingli/think-library/src/tools/Node.php:
-    newFile: !uuid 'e1c8a514d279d86da509fc972ff9c92bd3c3a81e'
-    oldFile: !uuid '23c3f7c2936ec556dc11f9bdf7c9d3fdda798e56'
-gitCommitId: !uuid '4fa3cea59dd127a790b6c720400ac986d560dc5f'
+  /application:
+    newFile: !uuid 'ef28f7e86199f363ae2fb10d99dcafb3d01e495b'
+    oldFile: !uuid '7ba62bd51705f22763b5757ef82acecd9bbe3726'
+  /application/admin:
+    newFile: !uuid '2cb731bca6f020d40fdb33a551115161728f3545'
+    oldFile: !uuid 'a060dd24e434bf71885988e37a50ab2a53dda48f'
+  /application/admin/controller:
+    newFile: !uuid 'ad46d941a3933e5fcb469274fba61a1ec3a22321'
+    oldFile: !uuid 'c2c08a04682d56ead3f3486e651f24f1080b4fca'
+  /application/admin/controller/Auth.php:
+    newFile: !uuid '642229812a25da0a0156aa04ab677d15932b51eb'
+    oldFile: !uuid 'ce21608a9c880f32fe8d96a4b04e960324e5ad21'
+  /application/admin/controller/Index.php:
+    newFile: !uuid 'fdf8beb135c1ea6e19f574cdc80bd6bb40ae8af0'
+    oldFile: !uuid 'c9959317064a04df7e7a4c03f9419b583f18c05b'
+  /application/admin/controller/Log.php:
+    newFile: null
+    oldFile: !uuid '424a29a89f92479b154cd8b6d27e422f73b1ede5'
+  /application/admin/controller/Login.php:
+    newFile: !uuid 'afdf769007542d2f2748eced355f586f13ec4a60'
+    oldFile: !uuid '80db67121629d26370c245e8a59ed2cb9d816238'
+  /application/admin/controller/Menu.php:
+    newFile: !uuid '14ee3fa14a89ec4d70e928a399066080ccb81356'
+    oldFile: !uuid '0d48782be7f0ab6da51d0e49f8a275f0b6ec26d5'
+  /application/admin/controller/Message.php:
+    newFile: !uuid '6913ed5d89c518b308c515a76a0f62e34aa20ff8'
+    oldFile: !uuid '0ee72caaf1ca4e3e11999a9ebbf74efb9e135f61'
+  /application/admin/controller/Node.php:
+    newFile: !uuid '6dceab9d6e40b9af0436b2aca2e6a210bf434ab8'
+    oldFile: !uuid '529299247ffc6bf96ecdd74e602c562d45d8e4d0'
+  /application/admin/controller/Queue.php:
+    newFile: !uuid '914a29ffbf2e1f12d57fc4e7c39fb249050a7ac2'
+    oldFile: !uuid '8a5eacc5d746671b519f25c17c6da763f97ae3d2'
+  /application/admin/controller/User.php:
+    newFile: !uuid '8c526051e11ef39a8666aaea62c55da598c3afc2'
+    oldFile: !uuid '1fe8ab150e6b7ef9630f9077d26e5e84427862c7'
+  /application/admin/controller/api:
+    newFile: !uuid '6e1e28019d2b4cca82a74693ae58876567d89722'
+    oldFile: !uuid '9e3d99237cc1c29442807f6706db24e649567f9e'
+  /application/admin/controller/api/Message.php:
+    newFile: !uuid '9e8bd9c2e8017e048f7eb08df4de0e423d8c9b62'
+    oldFile: !uuid '7e68548bce0b4b9a1acd6997201b9728e51dd4af'
+  /application/admin/controller/api/Plugs.php:
+    newFile: !uuid 'f29c599cad63214baac1d55e551e54f43b375deb'
+    oldFile: !uuid 'd6e9564baf9327d842ef830f37c73aa414c31ece'
+  /application/admin/queue:
+    newFile: null
+    oldFile: !uuid 'c96706e97516d1ba84b080d47ac36d9f62115d62'
+  /application/admin/queue/JobsBase.php:
+    newFile: null
+    oldFile: !uuid '5045c2caf1e4a2a6bc428e333c546185943eaa7b'
+  /application/admin/service:
+    newFile: null
+    oldFile: !uuid 'c7f64c702954b2a33b2319710b541ca2867cf391'
+  /application/admin/service/Auth.php:
+    newFile: null
+    oldFile: !uuid 'a9c67a7d122df2ce479ca5bac914718031f5d702'
+  /application/admin/service/Log.php:
+    newFile: null
+    oldFile: !uuid '0f706f59ffdd7387ff7f905f204faf28a0ce9cb3'
+  /application/admin/service/Message.php:
+    newFile: null
+    oldFile: !uuid '2bb5a64b8e4f3487ecbf547bd9a5ba401f72f04e'
+  /application/admin/service/Queue.php:
+    newFile: null
+    oldFile: !uuid '1ebd7b1b440fbe07e2fb014523a752a8d89b0dd2'
+  /application/admin/sys.php:
+    newFile: !uuid '77e37c3d7366308e643efa06fc6cbe9449e3bfe4'
+    oldFile: !uuid '9524dbb62a544e0e04541fc0f3b16e47e00ccb03'
+  /application/admin/view:
+    newFile: !uuid '6ba59ad3d363d57668cae836acf2b0d8aec9ef20'
+    oldFile: !uuid '18f21cf26a3989b0fd98f95a62fdc4f2af0a6e6f'
+  /application/admin/view/auth:
+    newFile: !uuid '6700039bb1369ac9af7ec626cff4ea11aa6330f3'
+    oldFile: !uuid '9c40cb38ed8cf633e9b80ac3e6b12b6142a89ed9'
+  /application/admin/view/auth/index.html:
+    newFile: !uuid '5c5a28e49083fee8a6d7fcc45f4e750c240bc69e'
+    oldFile: !uuid '119d50467965d1209e6939945d24952bb1b6b1b3'
+  /application/admin/view/config:
+    newFile: !uuid '2e41086a9acebdfc2d16e068233a1c929a8b6fef'
+    oldFile: !uuid '819a3777b905bd99c14dc713aac90380372efef0'
+  /application/admin/view/config/file.html:
+    newFile: !uuid '450b5c8ff7c7f7f9e1d512bf6e1afacc2dfaf9c0'
+    oldFile: !uuid '4aeca1b90c635730dfa1dc106132fb6b5e5fe396'
+  /application/admin/view/config/info.html:
+    newFile: !uuid '5349bd25f4ce4fdc521d98de8cb270f75ff5652a'
+    oldFile: !uuid '3b834f5d10d8196bbe3b28dd13782a43d73fc14e'
+  /application/admin/view/index:
+    newFile: !uuid '6cf0cc188fcd0fcb0a9ee6cc85cbbd9acf14d110'
+    oldFile: !uuid 'c68131ddc2d200c4a99f83771b2b3ecac7d64260'
+  /application/admin/view/index/main.html:
+    newFile: !uuid '0431921a44e49e1f68a58cf4d9922f8358a28113'
+    oldFile: !uuid '8d2cfc91e223f63fd082a29417895fba23157472'
+  /application/admin/view/log:
+    newFile: null
+    oldFile: !uuid 'bf32e0f60372b30f966028c1faaf0ad76efe2b91'
+  /application/admin/view/log/index.html:
+    newFile: null
+    oldFile: !uuid '28c526e5089ab2de850dd40c1df884b7d738fec4'
+  /application/admin/view/log/index_search.html:
+    newFile: null
+    oldFile: !uuid '265e3800105a34cb8074c3802192f28b6b3c5aa9'
+  /application/admin/view/menu:
+    newFile: !uuid '4cb824cad367d70aca1ffdceb52340095383589e'
+    oldFile: !uuid '15e639c6c7c2eec45467d7b494d595d95917da3a'
+  /application/admin/view/menu/index.html:
+    newFile: !uuid '3d77cc842016be76623794fffa18d0bc74520366'
+    oldFile: !uuid '856ae6eb26697e88948598833f4ca0dfb34d1219'
+  /application/admin/view/message:
+    newFile: !uuid '39c76b4b6b66bfa7f9902c1d6a4d87ed6a957670'
+    oldFile: !uuid '199c2bcc23047bcbc5cbe09b994299269eb97f15'
+  /application/admin/view/message/index.html:
+    newFile: !uuid '11581109cccaf42fc93c88404fd75809d6ceb970'
+    oldFile: !uuid '9d1736156dbedab111542741386885f61e0e85d9'
+  /application/admin/view/node:
+    newFile: !uuid '74dc279b09ee668bad267616ef2db00b41a55bda'
+    oldFile: !uuid '1fe4bb53cc1e3b896076973d7a0556eef0e54149'
+  /application/admin/view/node/index.html:
+    newFile: !uuid '063dc0df21b2b76db39fa437821c688fbb759ed6'
+    oldFile: !uuid '7d53b6d70b0a5d78ae3592630147947deb91d43b'
+  /application/admin/view/queue:
+    newFile: !uuid 'c88f7a0eb5463ca9c2e2f4816123f28cafb1db13'
+    oldFile: !uuid 'e4a41d748d97340eeeb6a4ba3aca10ae168f5515'
+  /application/admin/view/queue/index.html:
+    newFile: !uuid 'bd8510e924a5568af57437095db3ee2e2b1d44e5'
+    oldFile: !uuid 'bbc2f922b9d9fae1ecf9e3bdcd727d30e6d2ff8d'
+  /application/admin/view/user:
+    newFile: !uuid '262d516270b2b5c851579b0c3cdb3d1c4a3e707e'
+    oldFile: !uuid '402cf9839cf7465ce5d76520484e5aacdbeb5bf1'
+  /application/admin/view/user/index.html:
+    newFile: !uuid 'a376e41d34d4f0791c8bcad33e9a2a0c595c8906'
+    oldFile: !uuid '8658ac3f9ac3b4f87d400d32d75c738ec0be3ccf'
+  /public:
+    newFile: !uuid 'a9fc7c762ea6d257375b37f92f7a3efea522c6e6'
+    oldFile: !uuid 'e9b11f76c0ff9412a4b5fd84e4b8b732ec201f77'
+  /public/static:
+    newFile: !uuid '743254e8cffd7666d527d840a9ad8f2a18fd18f2'
+    oldFile: !uuid '90256e4787fbd4971759dbad8195a3186ae91040'
+  /public/static/theme:
+    newFile: !uuid '9054c35b3b86df08c2e23d32cbf5ad0d948c73f0'
+    oldFile: !uuid '4902238608c8a447edc40afa01e30ef5828b14d0'
+  /public/static/theme/css:
+    newFile: !uuid '54d916617afa14d278833b4a4e7e01e88d7941b9'
+    oldFile: !uuid '9490e23b497e6c0ae7ec1ca33b999b6359b7a05a'
+  /public/static/theme/css/console.css:
+    newFile: !uuid '08137a26402a643f7d8b5d2e6466bc2c84311a61'
+    oldFile: !uuid '99112a558d0ce24afbff9e174e9159b416476696'
+gitCommitId: !uuid '85f5f4e5523a9f001dbaec640746de41257530a2'
 renames: {
   }
-revisionId: 1147
+revisionId: 1148