#2001: 处理多应用组件兼容问题

2026-07-16 20:23:52 +08:00 · 2020-07-30 16:12:56 +08:00 · 2020-07-30 16:12:56 +08:00 · 6b08623776
commit 6b08623776
parent e8418c4f04 98f42ed0cd
2 changed files with 113 additions and 25 deletions
--- a/commit.ref
+++ b/commit.ref
@ -1 +1 @@
-Subproject commit 5bdb46f76617777d846764a061e9728ee3d1d5e7
+Subproject commit 98f42ed0cdabc29ac6e94d4e5d8210a3c8cf8645
--- a/commit.yml
+++ b/commit.yml
@ -2,37 +2,125 @@
 branches: {
  }
 fileChange:
+  /composer.json:
+    newFile: !uuid 'a56cdda3be0a52650cd0cd1aee8b0342e2c90ff1'
+    oldFile: !uuid '2e71f24f97a66616523f995c337f03df24a39469'
  /composer.lock:
-    newFile: !uuid 'af7a540165ce49879aae0ea766666a2a8910a556'
-    oldFile: !uuid '6924639d39a2a280bf81edbb10c13dc14420da34'
+    newFile: !uuid '952943e12775e983c985a05944fc66aef69070da'
+    oldFile: !uuid 'af7a540165ce49879aae0ea766666a2a8910a556'
  /vendor:
-    newFile: !uuid 'e3d95e39ef88b0dd65947b3f52f5cf2619ff6100'
-    oldFile: !uuid 'eabe34de2d7b190d65ec985d172e36550241ebea'
+    newFile: !uuid 'de4a0d02e909d1d5093adcd5d283b109851fe67c'
+    oldFile: !uuid 'e3d95e39ef88b0dd65947b3f52f5cf2619ff6100'
  /vendor/composer:
-    newFile: !uuid 'c56db37610016dd9b14995a4a225af126e8a37f4'
-    oldFile: !uuid '38088cce8849d6079ec3b1cf0589b3999a2f307a'
+    newFile: !uuid '88fc6f1a01f633330ba661d79cbcabaf6d46c747'
+    oldFile: !uuid 'c56db37610016dd9b14995a4a225af126e8a37f4'
+  /vendor/composer/autoload_classmap.php:
+    newFile: !uuid '91a290b7e2febeb684a0bb8e42c93cecd7f8d412'
+    oldFile: !uuid 'd34cb6c72b670cf6fe8bf97b440e834f35b9ff58'
+  /vendor/composer/autoload_psr4.php:
+    newFile: !uuid '24c40545c25a01e9d75b82c5aacc11819691b0ef'
+    oldFile: !uuid 'e746b086e755aa560fe19c67ab011a8518c21b3a'
+  /vendor/composer/autoload_static.php:
+    newFile: !uuid 'b477446189c0eafe93b0f1318a704e279a67e56c'
+    oldFile: !uuid 'be7cb838deb70fdf63f64fcb49d50c8fd9dc6c3f'
  /vendor/composer/installed.json:
-    newFile: !uuid '51f1c0666cb9c1bd1172a7dcaea12c2d1b363643'
-    oldFile: !uuid '976c3dab74abfbfef9728817de086ac7774f9610'
+    newFile: !uuid 'd3c0d107bc6f9a7cd075550b6f533bf707186b53'
+    oldFile: !uuid '51f1c0666cb9c1bd1172a7dcaea12c2d1b363643'
  /vendor/services.php:
-    newFile: !uuid 'e353bd4167d8cf9bbf8506157fff61149a4ab0b3'
-    oldFile: !uuid '45f2153606455d5e4d662e929fc7e5319b26aaef'
+    newFile: !uuid '181c72e2f9c5ec5c0f01730d23d887eabc025fdc'
+    oldFile: !uuid 'e353bd4167d8cf9bbf8506157fff61149a4ab0b3'
+  /vendor/topthink:
+    newFile: !uuid 'aab1463906ff2ff7a6ce377f87689931cd117c82'
+    oldFile: !uuid '08660cd4b992cdd79852b683daa7b0f5e75c450e'
+  /vendor/topthink/think-multi-app:
+    newFile: null
+    oldFile: !uuid '757452d9e017e58f7b174d2dfefba3ab79fcb918'
+  /vendor/topthink/think-multi-app/LICENSE:
+    newFile: null
+    oldFile: !uuid '261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64'
+  /vendor/topthink/think-multi-app/README.md:
+    newFile: null
+    oldFile: !uuid 'a746fa7a7befa35a2743b558c8ea57bf5889a833'
+  /vendor/topthink/think-multi-app/composer.json:
+    newFile: null
+    oldFile: !uuid '92d620eb1db998841ef6213f1a7ae81f8ec8ddae'
+  /vendor/topthink/think-multi-app/src:
+    newFile: null
+    oldFile: !uuid '9f6bfae81ac72c5a639799b9b2a955eb3f351a74'
+  /vendor/topthink/think-multi-app/src/MultiApp.php:
+    newFile: null
+    oldFile: !uuid 'b0ac260d9d116cc5ebc65764f1e6b52ec2ebf578'
+  /vendor/topthink/think-multi-app/src/Service.php:
+    newFile: null
+    oldFile: !uuid '22b85320da8e14a118d767d5c4e83f78c83a0711'
+  /vendor/topthink/think-multi-app/src/Url.php:
+    newFile: null
+    oldFile: !uuid '7bd6057f9b1f1a495a58dd4ec6b05b830c1f224f'
+  /vendor/topthink/think-multi-app/src/command:
+    newFile: null
+    oldFile: !uuid '8b24760fbf6cdd0c82c776c8c9ae9a1de4329527'
+  /vendor/topthink/think-multi-app/src/command/Build.php:
+    newFile: null
+    oldFile: !uuid '65b2f87476205043314cb7c4ba57fe7db9dba3dd'
+  /vendor/topthink/think-multi-app/src/command/Clear.php:
+    newFile: null
+    oldFile: !uuid 'f5283a372a948454e3df5b570fc2d19d2f2653ed'
+  /vendor/topthink/think-multi-app/src/command/stubs:
+    newFile: null
+    oldFile: !uuid '6050a916745d868045700fdc38ec516524ce13d6'
+  /vendor/topthink/think-multi-app/src/command/stubs/controller.stub:
+    newFile: null
+    oldFile: !uuid '263c4c6429b49c6090ef75dd56264cf947c04d77'
  /vendor/zoujingli:
-    newFile: !uuid '90ecf1d64ce4cead142ade9546b007c4347b4dd0'
-    oldFile: !uuid '37801d81178389af58b88360096f6ce14d38b04a'
+    newFile: !uuid 'b09a07aa4b72795709e0e460c6283397237bc281'
+    oldFile: !uuid '90ecf1d64ce4cead142ade9546b007c4347b4dd0'
  /vendor/zoujingli/think-library:
-    newFile: !uuid '170505b6b28f0982922576aacec8696e4f656b63'
-    oldFile: !uuid '9ef7f8316915419503e377058e29cf4e22d2513a'
+    newFile: !uuid '0e71a073e58f156e136175ffef0fe5e2028c7a47'
+    oldFile: !uuid '170505b6b28f0982922576aacec8696e4f656b63'
+  /vendor/zoujingli/think-library/composer.json:
+    newFile: !uuid 'a01e4cf9157ee565f1d4ee46038d9d60e3e61a2f'
+    oldFile: !uuid '42e7f2ddc768f3814bec09400167bfddbfc23b63'
  /vendor/zoujingli/think-library/src:
-    newFile: !uuid 'a73ce77cf1659f72fe2dfc6f62c85664418d3e1b'
-    oldFile: !uuid '0d593e0ec2c4bcd5dfbf77c6ae56f986a5f27bbb'
+    newFile: !uuid '7810104d5844537e6d56213226bdc11c62ded799'
+    oldFile: !uuid 'a73ce77cf1659f72fe2dfc6f62c85664418d3e1b'
+  /vendor/zoujingli/think-library/src/Library.php:
+    newFile: !uuid 'd57d5d566db3371119983e8c73bfa0b564996f81'
+    oldFile: !uuid '9d5bd5d0874d56f91301aeb545975e76785f9efc'
+  /vendor/zoujingli/think-library/src/multiple:
+    newFile: !uuid '3ccf29d2d9681af6a6250387ea10a51f76ba751e'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/App.php:
+    newFile: !uuid '6dcc4d7031bf7b6cfada1999cedcf6e2037d8c2a'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/Url.php:
+    newFile: !uuid 'b0f138140c82bf29f4d196873fcff8ce6ae918cf'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/command:
+    newFile: !uuid '702f570239309e92a1a5161dd9755bd54bfd6067'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/command/Build.php:
+    newFile: !uuid 'fe4a94cc43ac0ea8232461d65e9eceba6228b386'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/command/Clear.php:
+    newFile: !uuid 'ed3b6147719731524eaf66f9aa43aba8aaef07c4'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/command/stubs:
+    newFile: !uuid '6050a916745d868045700fdc38ec516524ce13d6'
+    oldFile: null
+  /vendor/zoujingli/think-library/src/multiple/command/stubs/controller.stub:
+    newFile: !uuid '263c4c6429b49c6090ef75dd56264cf947c04d77'
+    oldFile: null
  /vendor/zoujingli/think-library/src/service:
-    newFile: !uuid '60df683aac94cdd2bf95067655edc7e417a43808'
-    oldFile: !uuid '5277db144e978694c38d0ff9b2e8b705d63a40b2'
+    newFile: !uuid '52431c45c9b3ebcaaf648c8dd750d23aa7c4f1df'
+    oldFile: !uuid '60df683aac94cdd2bf95067655edc7e417a43808'
  /vendor/zoujingli/think-library/src/service/QueueService.php:
-    newFile: !uuid '18e42eac2033fb621c3f3951e57081b1a27fcce2'
-    oldFile: !uuid '7cf83de5ad873ed3059aeda081b2b221a67aeaec'
-gitCommitId: !uuid '5bdb46f76617777d846764a061e9728ee3d1d5e7'
-renames: {
-  }
-revisionId: 2000
+    newFile: !uuid 'abb4c22f6c5eb49e69ce8de29fab6ac5ad79ba59'
+    oldFile: !uuid '18e42eac2033fb621c3f3951e57081b1a27fcce2'
+gitCommitId: !uuid '98f42ed0cdabc29ac6e94d4e5d8210a3c8cf8645'
+renames:
+  /vendor/zoujingli/think-library/src/multiple/App.php: /vendor/topthink/think-multi-app/src/MultiApp.php
+  /vendor/zoujingli/think-library/src/multiple/Url.php: /vendor/topthink/think-multi-app/src/Url.php
+  /vendor/zoujingli/think-library/src/multiple/command/Build.php: /vendor/topthink/think-multi-app/src/command/Build.php
+  /vendor/zoujingli/think-library/src/multiple/command/Clear.php: /vendor/topthink/think-multi-app/src/command/Clear.php
+  /vendor/zoujingli/think-library/src/multiple/command/stubs/controller.stub: /vendor/topthink/think-multi-app/src/command/stubs/controller.stub
+revisionId: 2001