From d7bb21e25daaf0458f46fce359db805c1033f26c Mon Sep 17 00:00:00 2001 From: Death-Satan <2771717608@qq.com> Date: Sat, 23 Dec 2023 23:40:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=BC=93=E5=AD=98=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Setting/Model/SettingConfig.php | 2 +- app/System/Service/SystemDictDataService.php | 2 +- composer.json | 5 +- composer.lock | 171 ++++++++++++------- 4 files changed, 118 insertions(+), 62 deletions(-) diff --git a/app/Setting/Model/SettingConfig.php b/app/Setting/Model/SettingConfig.php index 0cc45cfd..d5aa45da 100644 --- a/app/Setting/Model/SettingConfig.php +++ b/app/Setting/Model/SettingConfig.php @@ -47,5 +47,5 @@ class SettingConfig extends MineModel /** * The attributes that should be cast to native types. */ - protected array $casts = ['group_id' => 'integer', 'sort' => 'integer']; + protected array $casts = ['group_id' => 'integer', 'sort' => 'integer','config_select_data'=>'array']; } diff --git a/app/System/Service/SystemDictDataService.php b/app/System/Service/SystemDictDataService.php index 78c69848..936f62ab 100644 --- a/app/System/Service/SystemDictDataService.php +++ b/app/System/Service/SystemDictDataService.php @@ -58,7 +58,7 @@ public function getLists(?array $params = null): array /** * 查询一个字典. */ - #[Cacheable(prefix: 'system:dict:data', ttl: 600, listener: 'system-dict-update')] + #[Cacheable(prefix: 'system:dict:data', ttl: 600, listener: 'system-dict-update',value: 'value')] public function getList(?array $params = null, bool $isScope = false): array { $args = [ diff --git a/composer.json b/composer.json index f091767f..842f0b92 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,12 @@ "license": "Apache-2.0", "require": { "xmo/jwt-auth": "2.0.0-alpha.2", - "xmo/mine-core": "2.0.0-alpha.2", + "xmo/mine-core": "2.0.0-alpha.3", "xmo/mine-helpers": "2.0.0-alpha.2", "xmo/mine-office": "2.0.0-alpha.2", "xmo/mine-translatable": "2.0.0-alpha.2", - "xmo/mine-generator": "2.0.0-alpha.2" + "xmo/mine-generator": "2.0.0-alpha.2", + "xmo/mine-service": "2.0.0-alpha.3" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.0", diff --git a/composer.lock b/composer.lock index 4104bff9..922c90e3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2df722543621530d6673cc8684aa7234", + "content-hash": "a2d4019d42938494179fed393b1c8279", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -1331,16 +1331,16 @@ }, { "name": "hyperf/amqp", - "version": "v3.1.0", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/hyperf/amqp.git", - "reference": "de0a82343264217ffc3c1f180d446fc5998f84d1" + "reference": "dae558843dbb1b12b5f7e7a9e01af063de4be3ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hyperf/amqp/zipball/de0a82343264217ffc3c1f180d446fc5998f84d1", - "reference": "de0a82343264217ffc3c1f180d446fc5998f84d1", + "url": "https://api.github.com/repos/hyperf/amqp/zipball/dae558843dbb1b12b5f7e7a9e01af063de4be3ae", + "reference": "dae558843dbb1b12b5f7e7a9e01af063de4be3ae", "shasum": "" }, "require": { @@ -1403,7 +1403,7 @@ "type": "open_collective" } ], - "time": "2023-11-24T03:10:53+00:00" + "time": "2023-12-15T09:45:03+00:00" }, { "name": "hyperf/async-queue", @@ -2261,16 +2261,16 @@ }, { "name": "hyperf/crontab", - "version": "v3.1.0", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/hyperf/crontab.git", - "reference": "e04d2397646301fd8a6a29c5a68a4457f69dab94" + "reference": "f10ebaef367c7c7d87ab97be7baade7973607c00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hyperf/crontab/zipball/e04d2397646301fd8a6a29c5a68a4457f69dab94", - "reference": "e04d2397646301fd8a6a29c5a68a4457f69dab94", + "url": "https://api.github.com/repos/hyperf/crontab/zipball/f10ebaef367c7c7d87ab97be7baade7973607c00", + "reference": "f10ebaef367c7c7d87ab97be7baade7973607c00", "shasum": "" }, "require": { @@ -2326,7 +2326,7 @@ "type": "open_collective" } ], - "time": "2023-11-24T03:10:53+00:00" + "time": "2023-12-19T09:01:35+00:00" }, { "name": "hyperf/database", @@ -5985,16 +5985,16 @@ }, { "name": "overtrue/flysystem-qiniu", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/overtrue/flysystem-qiniu.git", - "reference": "cf87e0fd74ba80736c7e0e9d19e1422eee6617d2" + "reference": "5e04ac38be53b57345c56e02973fc4224db776e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/flysystem-qiniu/zipball/cf87e0fd74ba80736c7e0e9d19e1422eee6617d2", - "reference": "cf87e0fd74ba80736c7e0e9d19e1422eee6617d2", + "url": "https://api.github.com/repos/overtrue/flysystem-qiniu/zipball/5e04ac38be53b57345c56e02973fc4224db776e6", + "reference": "5e04ac38be53b57345c56e02973fc4224db776e6", "shasum": "" }, "require": { @@ -6036,7 +6036,7 @@ "description": "Flysystem adapter for the Qiniu storage.", "support": { "issues": "https://github.com/overtrue/flysystem-qiniu/issues", - "source": "https://github.com/overtrue/flysystem-qiniu/tree/3.2.2" + "source": "https://github.com/overtrue/flysystem-qiniu/tree/3.2.3" }, "funding": [ { @@ -6044,7 +6044,7 @@ "type": "github" } ], - "time": "2023-05-02T13:14:45+00:00" + "time": "2023-12-21T14:40:53+00:00" }, { "name": "overtrue/qcloud-cos-client", @@ -9760,16 +9760,16 @@ }, { "name": "xmo/mine-core", - "version": "v2.0.0-alpha.2", + "version": "v2.0.0-alpha.3", "source": { "type": "git", "url": "https://github.com/mineadmin/mine.git", - "reference": "32dc2ca704e0ab0990e5eedee6a0d47e3299cac3" + "reference": "9cca7e52ef404c5fd402c3b00cb6bda190e24827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mineadmin/mine/zipball/32dc2ca704e0ab0990e5eedee6a0d47e3299cac3", - "reference": "32dc2ca704e0ab0990e5eedee6a0d47e3299cac3", + "url": "https://api.github.com/repos/mineadmin/mine/zipball/9cca7e52ef404c5fd402c3b00cb6bda190e24827", + "reference": "9cca7e52ef404c5fd402c3b00cb6bda190e24827", "shasum": "" }, "require": { @@ -9863,9 +9863,9 @@ ], "support": { "issues": "https://github.com/mineadmin/mine/issues", - "source": "https://github.com/mineadmin/mine/tree/v2.0.0-alpha.2" + "source": "https://github.com/mineadmin/mine/tree/v2.0.0-alpha.3" }, - "time": "2023-12-21T07:36:29+00:00" + "time": "2023-12-23T15:20:40+00:00" }, { "name": "xmo/mine-generator", @@ -10020,6 +10020,61 @@ }, "time": "2023-12-21T06:06:47+00:00" }, + { + "name": "xmo/mine-service", + "version": "v2.0.0-alpha.3", + "source": { + "type": "git", + "url": "https://github.com/mineadmin/mine-service.git", + "reference": "06891b2975818fc32242c39ecfec473f5c366c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mineadmin/mine-service/zipball/06891b2975818fc32242c39ecfec473f5c366c9e", + "reference": "06891b2975818fc32242c39ecfec473f5c366c9e", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "hyperf": { + "config": "Mine\\ServiceConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Mine\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "xmo", + "email": "root@imoi.cn", + "role": "Developer" + }, + { + "name": "Death-Satan", + "email": "2771717608@qq.com", + "role": "Developer" + } + ], + "description": "mineadmin Service package", + "keywords": [ + "mineadmin", + "service" + ], + "support": { + "issues": "https://github.com/mineadmin/mine-service/issues", + "source": "https://github.com/mineadmin/mine-service/tree/v2.0.0-alpha.3" + }, + "time": "2023-12-23T15:20:40+00:00" + }, { "name": "xmo/mine-translatable", "version": "v2.0.0-alpha.2", @@ -10763,16 +10818,16 @@ }, { "name": "hyperf/testing", - "version": "v3.1.0", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/hyperf/testing.git", - "reference": "a0b4f5472953ccadb4b54a39dfd6695dff5d3dcd" + "reference": "00be4729882b0fcc9f5307b08db635f6ad3b56cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hyperf/testing/zipball/a0b4f5472953ccadb4b54a39dfd6695dff5d3dcd", - "reference": "a0b4f5472953ccadb4b54a39dfd6695dff5d3dcd", + "url": "https://api.github.com/repos/hyperf/testing/zipball/00be4729882b0fcc9f5307b08db635f6ad3b56cc", + "reference": "00be4729882b0fcc9f5307b08db635f6ad3b56cc", "shasum": "" }, "require": { @@ -10818,7 +10873,7 @@ "testing" ], "support": { - "source": "https://github.com/hyperf/testing/tree/v3.1.0" + "source": "https://github.com/hyperf/testing/tree/v3.1.3" }, "funding": [ { @@ -10830,7 +10885,7 @@ "type": "open_collective" } ], - "time": "2023-11-29T03:44:48+00:00" + "time": "2023-12-17T08:53:12+00:00" }, { "name": "hyperf/watcher", @@ -11215,23 +11270,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.10", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/599109c8ca6bae97b23482d557d2874c25a65e59", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-text-template": "^3.0", @@ -11281,7 +11336,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -11289,7 +11344,7 @@ "type": "github" } ], - "time": "2023-12-11T06:28:43+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -11881,20 +11936,20 @@ }, { "name": "sebastian/complexity", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -11903,7 +11958,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -11927,7 +11982,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -11935,20 +11990,20 @@ "type": "github" } ], - "time": "2023-09-28T11:50:59+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -11961,7 +12016,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -11994,7 +12049,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -12002,7 +12057,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -12210,20 +12265,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -12256,7 +12311,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -12264,7 +12319,7 @@ "type": "github" } ], - "time": "2023-08-31T09:25:50+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator",