chore(release): 1.0.0-alpha.11

ci(docker): 兼容 ext-redis:6.0
Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>
2026-01-15 05:35:09 +08:00 · 2023-10-17 02:55:37 +00:00 · 2023-10-17 10:55:26 +08:00 · 2023-10-16 09:36:18 +00:00 · 2023-10-16 17:35:30 +08:00 · 2023-10-16 17:34:24 +08:00
11 changed files with 201 additions and 126 deletions
--- a/.idea/HDK-Core.iml
+++ b/.idea/HDK-Core.iml
@@ -158,6 +158,7 @@
      <excludeFolder url="file://$MODULE_DIR$/vendor/cooper/hyperf-pest" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/clock" />
      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php83" />
+      <excludeFolder url="file://$MODULE_DIR$/runtime" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,46 @@
 # 版本更新日志
+## [1.0.0-alpha.11](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.10...v1.0.0-alpha.11) (2023-10-17)
+
+
+### 👷 Continuous Integration | CI 配置
+
+* **docker:** 兼容 ext-redis:6.0 ([f80da66](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/f80da661859333acff005241d2abcfd7c9f09c71))
+
+## [1.0.0-alpha.10](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.9...v1.0.0-alpha.10) (2023-10-16)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([37d42c1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/37d42c17cc8707b17f1dd0fd8e0df5b8f4048bd2))
+* **script:** root 用户可以使用 composer ([12e9960](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/12e99604c99fee38aa82aa1fbc865201be09127f))
+
+
+### ✨ Features | 新功能
+
+* **rest:** 增加多表关联的兼容 ([17c0518](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/17c051868026981031abf3e88e86f7475ce06807))
+
+## [1.0.0-alpha.9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.8...v1.0.0-alpha.9) (2023-10-13)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([e9927fa](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/e9927fafb1630e759d3a55c0143b48db91ffdcae))
+* **config:** 更新了默认的发件邮箱 ([359b13e](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/359b13e71803c87854ec6e54b119cb3bbd65ef3f))
+
+## [1.0.0-alpha.8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2023-10-08)
+
+
+### ✨ Features | 新功能
+
+* **email:** 增加了对邮件优先级的兼容 ([9f7d4ef](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f7d4effb7e39500d0f65d35788551cc4e7a91f1))
+
+## [1.0.0-alpha.7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2023-09-28)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **rest:** 修复不存在的具名参数 ([1106794](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/110679448f310e1d4e25f370b74f2901ca9425d0))
+
 ## [1.0.0-alpha.6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2023-09-28)


--- a/VERSION_TRACKER.txt
+++ b/VERSION_TRACKER.txt
@@ -1 +1 @@
-1.0.0-alpha.6
+1.0.0-alpha.11
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
  ],
  "require": {
    "php": "^8.1",
-    "ext-redis": "^5.3",
+    "ext-redis": "^5.3|^6.0",
    "ext-swoole": "*",
    "composer/composer": ">=2.0",
    "ergebnis/http-method": "^2.2",
@@ -88,7 +88,20 @@
      "Singularity\\HDK\\Test\\Core\\": "tests/"
    }
  },
-  "minimum-stability": "dev",
+  "minimum-stability": "alpha",
+  "archive": {
+    "exclude": [
+      ".idea",
+      "tests",
+      "scripts",
+      "Dockerfile",
+      ".gitignore",
+      ".php-cs-fixer.*",
+      ".phpunit.result.cache",
+      "phpstan.dist.neon",
+      "phpunit.xml"
+    ]
+  },
  "prefer-stable": true,
  "scripts": {
    "post-root-package-install": [],
@@ -116,5 +129,5 @@
      "url": "https://mirrors.aliyun.com/composer/"
    }
  },
-  "version": "1.0.0-alpha.6"
+  "version": "1.0.0-alpha.11"
 }
--- 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": "618b42d31672ce285812471c656ddcdc",
+  "content-hash": "62f0f2fe99d4e03fb859cd27fbc9e169",
    "packages": [
        {
            "name": "composer/ca-bundle",
@@ -169,16 +169,16 @@
        },
        {
            "name": "composer/composer",
-            "version": "2.6.3",
+            "version": "2.6.4",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/composer.git",
-                "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd"
+                "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/ff477832e6d838a736556d4a39a3b80f4412abfd",
-                "reference": "ff477832e6d838a736556d4a39a3b80f4412abfd",
+                "url": "https://api.github.com/repos/composer/composer/zipball/d75d17c16a863438027d1d96401cddcd6aa5bb60",
+                "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60",
                "shasum": "",
                "mirrors": [
                    {
@@ -269,7 +269,7 @@
                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/composer/issues",
                "security": "https://github.com/composer/composer/security/policy",
-                "source": "https://github.com/composer/composer/tree/2.6.3"
+                "source": "https://github.com/composer/composer/tree/2.6.4"
            },
            "funding": [
                {
@@ -285,7 +285,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-15T07:38:22+00:00"
+            "time": "2023-09-29T08:54:47+00:00"
        },
        {
            "name": "composer/metadata-minifier",
@@ -1118,16 +1118,16 @@
        },
        {
            "name": "hyperf/codec",
-            "version": "v3.0.37",
+            "version": "v3.0.38",
            "source": {
                "type": "git",
                "url": "https://github.com/hyperf/codec.git",
-                "reference": "7eb45c26990e177487dba9790408d5ad91cf1774"
+                "reference": "dfe4ff846540362c5a56e9ade6bdeef16d264fb8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/codec/zipball/7eb45c26990e177487dba9790408d5ad91cf1774",
-                "reference": "7eb45c26990e177487dba9790408d5ad91cf1774",
+                "url": "https://api.github.com/repos/hyperf/codec/zipball/dfe4ff846540362c5a56e9ade6bdeef16d264fb8",
+                "reference": "dfe4ff846540362c5a56e9ade6bdeef16d264fb8",
                "shasum": "",
                "mirrors": [
                    {
@@ -1174,7 +1174,7 @@
                "pull-request": "https://github.com/hyperf/hyperf/pulls",
                "source": "https://github.com/hyperf/hyperf"
            },
-            "time": "2023-09-19T01:50:18+00:00"
+            "time": "2023-09-30T06:00:08+00:00"
        },
        {
            "name": "hyperf/collection",
@@ -1720,16 +1720,16 @@
        },
        {
            "name": "hyperf/engine",
-            "version": "v2.10.0",
+            "version": "v2.10.3",
            "source": {
                "type": "git",
                "url": "https://github.com/hyperf/engine.git",
-                "reference": "9b27b29041403b8ee397ffe1e5254816e18cb5b9"
+                "reference": "7e7238708f29f39df643aba25485ba1c075943c1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/engine/zipball/9b27b29041403b8ee397ffe1e5254816e18cb5b9",
-                "reference": "9b27b29041403b8ee397ffe1e5254816e18cb5b9",
+                "url": "https://api.github.com/repos/hyperf/engine/zipball/7e7238708f29f39df643aba25485ba1c075943c1",
+                "reference": "7e7238708f29f39df643aba25485ba1c075943c1",
                "shasum": "",
                "mirrors": [
                    {
@@ -1790,9 +1790,9 @@
            ],
            "support": {
                "issues": "https://github.com/hyperf/engine/issues",
-                "source": "https://github.com/hyperf/engine/tree/v2.10.0"
+                "source": "https://github.com/hyperf/engine/tree/v2.10.3"
            },
-            "time": "2023-07-14T02:28:58+00:00"
+            "time": "2023-09-30T14:57:09+00:00"
        },
        {
            "name": "hyperf/engine-contract",
@@ -2291,16 +2291,16 @@
        },
        {
            "name": "hyperf/redis",
-            "version": "v3.0.37",
+          "version": "v3.0.39",
            "source": {
                "type": "git",
                "url": "https://github.com/hyperf/redis.git",
-                "reference": "270720a8fe23ca4807ac03eaad9f888f19c945f8"
+              "reference": "104366a4da9639e148ffc1230c5b61c81cbf6d78"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/redis/zipball/270720a8fe23ca4807ac03eaad9f888f19c945f8",
-                "reference": "270720a8fe23ca4807ac03eaad9f888f19c945f8",
+              "url": "https://api.github.com/repos/hyperf/redis/zipball/104366a4da9639e148ffc1230c5b61c81cbf6d78",
+              "reference": "104366a4da9639e148ffc1230c5b61c81cbf6d78",
                "shasum": "",
                "mirrors": [
                    {
@@ -2310,7 +2310,7 @@
                ]
            },
            "require": {
-                "ext-redis": "<6.0",
+              "ext-redis": "^5.0|^6.0",
                "hyperf/contract": "~3.0.0",
                "hyperf/pool": "~3.0.0",
                "hyperf/support": "~3.0.0",
@@ -2355,7 +2355,7 @@
                "pull-request": "https://github.com/hyperf/hyperf/pulls",
                "source": "https://github.com/hyperf/hyperf"
            },
-            "time": "2023-09-19T01:50:18+00:00"
+          "time": "2023-10-12T13:10:56+00:00"
        },
        {
            "name": "hyperf/resource",
@@ -2864,16 +2864,16 @@
        },
        {
            "name": "justinrainbow/json-schema",
-            "version": "5.2.12",
+            "version": "v5.2.13",
            "source": {
                "type": "git",
                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
+                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
-                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
                "shasum": "",
                "mirrors": [
                    {
@@ -2934,9 +2934,9 @@
            ],
            "support": {
                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
+                "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
            },
-            "time": "2022-04-13T08:02:27+00:00"
+            "time": "2023-09-26T02:20:38+00:00"
        },
        {
            "name": "laminas/laminas-mime",
@@ -4355,16 +4355,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v6.3.4",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "cac1556fdfdf6719668181974104e6fcfa60e844"
+                "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cac1556fdfdf6719668181974104e6fcfa60e844",
-                "reference": "cac1556fdfdf6719668181974104e6fcfa60e844",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b50f5e281d722cb0f4c296f908bacc3e2b721957",
+                "reference": "b50f5e281d722cb0f4c296f908bacc3e2b721957",
                "shasum": "",
                "mirrors": [
                    {
@@ -4418,7 +4418,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.3.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.3.5"
            },
            "funding": [
                {
@@ -4434,7 +4434,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-22T08:20:46+00:00"
+            "time": "2023-09-04T21:33:54+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -5292,16 +5292,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v6.3.2",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "53d1a83225002635bca3482fcbf963001313fb68"
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
-                "reference": "53d1a83225002635bca3482fcbf963001313fb68",
+                "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
+                "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
                "shasum": "",
                "mirrors": [
                    {
@@ -5364,7 +5364,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.2"
+                "source": "https://github.com/symfony/string/tree/v6.3.5"
            },
            "funding": [
                {
@@ -5380,7 +5380,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-05T08:41:27+00:00"
+            "time": "2023-09-18T10:38:32+00:00"
        },
        {
            "name": "teapot/status-code",
@@ -6522,16 +6522,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.27.0",
+          "version": "v3.35.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6"
+              "reference": "ec1ccc264994b6764882669973ca435cf05bab08"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e73ccaae1208f017bb7860986eebb3da48bd25d6",
-                "reference": "e73ccaae1208f017bb7860986eebb3da48bd25d6",
+              "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ec1ccc264994b6764882669973ca435cf05bab08",
+              "reference": "ec1ccc264994b6764882669973ca435cf05bab08",
                "shasum": "",
                "mirrors": [
                    {
@@ -6570,8 +6570,6 @@
                "phpspec/prophecy": "^1.16",
                "phpspec/prophecy-phpunit": "^2.0",
                "phpunit/phpunit": "^9.5",
-                "phpunitgoodpractices/polyfill": "^1.6",
-                "phpunitgoodpractices/traits": "^1.9.2",
                "symfony/phpunit-bridge": "^6.2.3",
                "symfony/yaml": "^5.4 || ^6.0"
            },
@@ -6611,7 +6609,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.27.0"
+              "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.35.1"
            },
            "funding": [
                {
@@ -6619,7 +6617,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-09-17T14:37:54+00:00"
+          "time": "2023-10-12T13:47:26+00:00"
        },
        {
            "name": "guzzlehttp/guzzle",
@@ -7482,16 +7480,16 @@
        },
        {
            "name": "hyperf/server",
-            "version": "v3.0.37",
+          "version": "v3.0.39",
            "source": {
                "type": "git",
                "url": "https://github.com/hyperf/server.git",
-                "reference": "3702c58c3617ec2e845e1f2d13a903b92be63100"
+              "reference": "b8e305dc7583762a5e3815b1da984e7cf2f13388"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/server/zipball/3702c58c3617ec2e845e1f2d13a903b92be63100",
-                "reference": "3702c58c3617ec2e845e1f2d13a903b92be63100",
+              "url": "https://api.github.com/repos/hyperf/server/zipball/b8e305dc7583762a5e3815b1da984e7cf2f13388",
+              "reference": "b8e305dc7583762a5e3815b1da984e7cf2f13388",
                "shasum": "",
                "mirrors": [
                    {
@@ -7548,7 +7546,7 @@
                "pull-request": "https://github.com/hyperf/hyperf/pulls",
                "source": "https://github.com/hyperf/hyperf"
            },
-            "time": "2023-09-19T01:50:18+00:00"
+          "time": "2023-10-08T15:14:41+00:00"
        },
        {
            "name": "hyperf/session",
@@ -8372,16 +8370,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.10.35",
+            "version": "1.10.37",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3"
+                "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e730e5facb75ffe09dfb229795e8c01a459f26c3",
-                "reference": "e730e5facb75ffe09dfb229795e8c01a459f26c3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/058ba07e92f744d4dcf6061ae75283d0c6456f2e",
+                "reference": "058ba07e92f744d4dcf6061ae75283d0c6456f2e",
                "shasum": "",
                "mirrors": [
                    {
@@ -8436,20 +8434,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-19T15:27:56+00:00"
+            "time": "2023-10-02T16:18:37+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.28",
+            "version": "9.2.29",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef"
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef",
-                "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
                "shasum": "",
                "mirrors": [
                    {
@@ -8512,7 +8510,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/9.2.28"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
            },
            "funding": [
                {
@@ -8520,7 +8518,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-09-12T14:36:20+00:00"
+            "time": "2023-09-19T04:57:46+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -9250,12 +9248,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "d029d96d998fb1b82e5831b4858fefe1baceb8c5"
+              "reference": "efd339340c840237fad050f3ea6fd8bbbbfc7ed6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d029d96d998fb1b82e5831b4858fefe1baceb8c5",
-                "reference": "d029d96d998fb1b82e5831b4858fefe1baceb8c5",
+              "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/efd339340c840237fad050f3ea6fd8bbbbfc7ed6",
+              "reference": "efd339340c840237fad050f3ea6fd8bbbbfc7ed6",
                "shasum": "",
                "mirrors": [
                    {
@@ -9339,8 +9337,8 @@
                "codeigniter4/framework": "<4.3.5",
                "codeigniter4/shield": "<1.0.0.0-beta4",
                "codiad/codiad": "<=2.8.4",
-                "composer/composer": "<1.10.26|>=2,<2.2.12|>=2.3,<2.3.5",
-                "concrete5/concrete5": "<9.2",
+                "composer/composer": "<1.10.27|>=2,<2.2.22|>=2.3,<2.6.4",
+                "concrete5/concrete5": "<=9.2.1",
                "concrete5/core": "<8.5.8|>=9,<9.1",
                "contao-components/mediaelement": ">=2.14.2,<2.21.1",
                "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
@@ -9372,7 +9370,7 @@
                "doctrine/mongodb-odm": ">=1,<1.0.2",
                "doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
                "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
-                "dolibarr/dolibarr": "<17.0.1",
+                "dolibarr/dolibarr": "<18",
                "dompdf/dompdf": "<2.0.2|==2.0.2",
                "drupal/core": "<9.4.14|>=9.5,<9.5.8|>=10,<10.0.8",
                "drupal/drupal": ">=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
@@ -9401,7 +9399,7 @@
                "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev",
                "ezsystems/ezplatform-user": ">=1,<1.0.1",
                "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.30",
-                "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1",
+                "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1",
                "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
                "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15",
                "ezyang/htmlpurifier": "<4.1.1",
@@ -9452,6 +9450,7 @@
                "gree/jose": "<2.2.1",
                "gregwar/rst": "<1.0.3",
                "grumpydictator/firefly-iii": "<6",
+                "gugoan/economizzer": "<=0.9.0.0-beta1",
                "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
                "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
                "haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2",
@@ -9477,7 +9476,7 @@
                "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
                "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
                "impresscms/impresscms": "<=1.4.5",
-                "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.1",
+                "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.2",
                "in2code/ipandlanguageredirect": "<5.1.2",
                "in2code/lux": "<17.6.1|>=18,<24.0.2",
                "innologi/typo3-appointments": "<2.0.6",
@@ -9495,7 +9494,7 @@
                "joomla/filter": "<1.4.4|>=2,<2.0.1",
                "joomla/framework": ">=2.5.4,<=3.8.12",
                "joomla/input": ">=2,<2.0.2",
-                "joomla/joomla-cms": "<3.9.12",
+                "joomla/joomla-cms": ">=2.5,<3.9.12",
                "joomla/session": "<1.3.1",
                "joyqi/hyper-down": "<=2.4.27",
                "jsdecena/laracom": "<2.0.9",
@@ -9587,12 +9586,12 @@
                "onelogin/php-saml": "<2.10.4",
                "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5",
                "open-web-analytics/open-web-analytics": "<1.7.4",
-                "opencart/opencart": "<=3.0.3.7",
+                "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev",
                "openid/php-openid": "<2.3",
                "openmage/magento-lts": "<=19.5|>=20,<=20.1",
                "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
                "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5",
-                "oro/commerce": ">=4.1,<5.0.6",
+              "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1",
                "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
                "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8",
                "oxid-esales/oxideshop-ce": "<4.5",
@@ -9626,9 +9625,10 @@
                "phpxmlrpc/extras": "<0.6.1",
                "phpxmlrpc/phpxmlrpc": "<4.9.2",
                "pi/pi": "<=2.5",
-                "pimcore/admin-ui-classic-bundle": "<1.0.3",
+                "pimcore/admin-ui-classic-bundle": "<1.1.2",
                "pimcore/customer-management-framework-bundle": "<3.4.2",
                "pimcore/data-hub": "<1.2.4",
+                "pimcore/demo": "<10.3",
                "pimcore/perspective-editor": "<1.5.1",
                "pimcore/pimcore": "<10.6.8",
                "pixelfed/pixelfed": "<=0.11.4",
@@ -9639,7 +9639,7 @@
                "prestashop/blockwishlist": ">=2,<2.1.1",
                "prestashop/contactform": ">=1.0.1,<4.3",
                "prestashop/gamification": "<2.3.2",
-                "prestashop/prestashop": "<=8.1",
+                "prestashop/prestashop": "<8.1.2",
                "prestashop/productcomments": "<5.0.2",
                "prestashop/ps_emailsubscription": "<2.6.1",
                "prestashop/ps_facetedsearch": "<3.4.1",
@@ -9649,11 +9649,12 @@
                "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7",
                "propel/propel1": ">=1,<=1.7.1",
                "pterodactyl/panel": "<1.7",
-                "ptheofan/yii2-statemachine": ">=2",
+                "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2",
                "ptrofimov/beanstalk_console": "<1.7.14",
                "pusher/pusher-php-server": "<2.2.1",
                "pwweb/laravel-core": "<=0.3.6.0-beta",
                "pyrocms/pyrocms": "<=3.9.1",
+                "rainlab/blog-plugin": "<1.4.1",
                "rainlab/debugbar-plugin": "<3.1",
                "rainlab/user-plugin": "<=1.4.5",
                "rankmath/seo-by-rank-math": "<=1.0.95",
@@ -9706,12 +9707,12 @@
                "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9",
                "simplito/elliptic-php": "<1.0.6",
                "sitegeist/fluid-components": "<3.5",
-                "sjbr/sr-freecap": "<=2.5.2",
+                "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3",
                "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1",
                "slim/slim": "<2.6",
                "slub/slub-events": "<3.0.3",
                "smarty/smarty": "<3.1.48|>=4,<4.3.1",
-                "snipe/snipe-it": "<=6.0.14",
+              "snipe/snipe-it": "<=6.2.2",
                "socalnick/scn-social-auth": "<1.15.2",
                "socialiteproviders/steam": "<1.1",
                "spatie/browsershot": "<3.57.4",
@@ -9789,7 +9790,7 @@
                "topthink/think": "<=6.1.1",
                "topthink/thinkphp": "<=3.2.3",
                "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2",
-                "tribalsystems/zenario": "<=9.3.57595",
+                "tribalsystems/zenario": "<=9.4.59197",
                "truckersmp/phpwhois": "<=4.3.1",
                "ttskch/pagination-service-provider": "<1",
                "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
@@ -9817,7 +9818,7 @@
                "vrana/adminer": "<4.8.1",
                "waldhacker/hcaptcha": "<2.1.2",
                "wallabag/tcpdf": "<6.2.22",
-                "wallabag/wallabag": "<=2.6.2",
+                "wallabag/wallabag": "<2.6.7",
                "wanglelecc/laracms": "<=1.0.3",
                "web-auth/webauthn-framework": ">=3.3,<3.3.4",
                "webbuilders-group/silverstripe-kapost-bridge": "<0.4",
@@ -9926,7 +9927,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-09-25T15:04:43+00:00"
+          "time": "2023-10-11T21:04:21+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@@ -11332,16 +11333,16 @@
        },
        {
            "name": "symfony/mailer",
-            "version": "v6.3.0",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435"
+                "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06",
+                "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06",
                "shasum": "",
                "mirrors": [
                    {
@@ -11398,7 +11399,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/mailer/tree/v6.3.5"
            },
            "funding": [
                {
@@ -11414,20 +11415,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2023-09-06T09:47:15+00:00"
        },
        {
            "name": "symfony/mime",
-            "version": "v6.3.3",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mime.git",
-                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98"
+                "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
-                "reference": "9a0cbd52baa5ba5a5b1f0cacc59466f194730f98",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
+                "reference": "d5179eedf1cb2946dbd760475ebf05c251ef6a6e",
                "shasum": "",
                "mirrors": [
                    {
@@ -11488,7 +11489,7 @@
                "mime-type"
            ],
            "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.3.3"
+                "source": "https://github.com/symfony/mime/tree/v6.3.5"
            },
            "funding": [
                {
@@ -11504,7 +11505,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-31T07:08:24+00:00"
+            "time": "2023-09-29T06:59:36+00:00"
        },
        {
            "name": "symfony/options-resolver",
@@ -11756,16 +11757,16 @@
        },
        {
            "name": "symfony/serializer",
-            "version": "v6.3.4",
+            "version": "v6.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/serializer.git",
-                "reference": "96d28a58d5a128bf77c54534b380eb7c92c8f846"
+                "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/96d28a58d5a128bf77c54534b380eb7c92c8f846",
-                "reference": "96d28a58d5a128bf77c54534b380eb7c92c8f846",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
+                "reference": "855fc058c8bdbb69f53834f2fdb3876c9bc0ab7c",
                "shasum": "",
                "mirrors": [
                    {
@@ -11836,7 +11837,7 @@
            "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/serializer/tree/v6.3.4"
+                "source": "https://github.com/symfony/serializer/tree/v6.3.5"
            },
            "funding": [
                {
@@ -11852,7 +11853,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-24T14:35:28+00:00"
+            "time": "2023-09-29T16:18:53+00:00"
        },
        {
            "name": "symfony/stopwatch",
@@ -12165,7 +12166,7 @@
        }
    ],
    "aliases": [],
-    "minimum-stability": "dev",
+  "minimum-stability": "alpha",
    "stability-flags": {
        "roave/security-advisories": 20
    },
@@ -12173,11 +12174,11 @@
    "prefer-lowest": false,
    "platform": {
        "php": "^8.1",
-        "ext-redis": "^5.3",
+      "ext-redis": "^5.3|^6.0",
        "ext-swoole": "*",
        "ext-libxml": "*",
        "ext-dom": "*"
    },
    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+  "plugin-api-version": "2.6.0"
 }
--- a/publish/common.php
+++ b/publish/common.php
@@ -62,8 +62,8 @@ return [
    // 第三方服务
    'third_party' => [
        'email' => [
-            'dsn' => 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465',
-            'mailer_sender' => 'account@luxcreo.ai',    // 发件邮箱
+            'dsn' => 'smtp://noreply@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465',
+            'mailer_sender' => 'noreply@luxcreo.ai',    // 发件邮箱
            'mailer_sender_name' => 'LuxCreo',          // 发件人名称
        ],
        'sms' => [
--- a/scripts/docker-env.sh
+++ b/scripts/docker-env.sh
@@ -2,7 +2,7 @@

 docker run \
    --pull always \
-    -ti --rm --name "hyperf-development-kit" \
+    -ti --rm --name "hdk-core" \
    -w "/srv/www" \
    -v "$(pwd)":/srv/www \
    -v ~/.ssh:/root/.ssh \
--- a/src/Events/EmailWillSent.php
+++ b/src/Events/EmailWillSent.php
@@ -9,6 +9,8 @@

 namespace Singularity\HDK\Core\Events;

+use Symfony\Component\Mime\Email;
+
 /**
 * Singularity\HDK\Core\Events\EmailWillSent@HDK-Core
 *
@@ -44,7 +46,13 @@ class EmailWillSent
        /**
         * @var 'text'|'html' $type
         */
-        public string $type = 'text'
+        public string $type = 'text',
+
+        /**
+         * @var int
+         * @see Email::priority()
+         */
+        public int $priority = Email::PRIORITY_NORMAL
    ) {
    }
 }
--- a/src/Listener/EmailWillSentListener.php
+++ b/src/Listener/EmailWillSentListener.php
@@ -62,18 +62,21 @@ class EmailWillSentListener implements ListenerInterface
                    target: $event->target,
                    subject: $event->subject,
                    html: $event->content,
-                    cc: $event->cc
+                    cc: $event->cc,
+                    priority: $event->priority
                )
                : $emailService->sendText(
                    target: $event->target,
                    subject: $event->subject,
                    text: $event->content,
-                    cc: $event->cc
+                    cc: $event->cc,
+                    priority: $event->priority
                );

            $stdoutLogger->info('邮件发送成功！');
            $stdoutLogger->info("To: $event->target");
            $stdoutLogger->info("Subject: $event->subject");
+            $stdoutLogger->info("Priority: $event->priority");
            $stdoutLogger->debug('Content: ');
            $stdoutLogger->debug($event->content);
        } catch (TransportExceptionInterface $e) {
--- a/src/Service/EmailService.php
+++ b/src/Service/EmailService.php
@@ -79,12 +79,14 @@ class EmailService
        string|array $target,
        string $subject,
        string $text,
-        array $cc = []
+        array $cc = [],
+        int $priority = Email::PRIORITY_NORMAL
    ): bool {
        $email = (new Email())
            ->from(Address::create($this->from))
            ->to(...(is_array($target) ? $target : [$target]))
            ->cc(...$cc)
+            ->priority($priority)
            ->subject($subject)
            ->text($text);

@@ -100,7 +102,7 @@ class EmailService
     * @param string $subject
     * @param string $html
     * @param array<string> $cc
-     *
+     * @param int $priority
     * @return bool
     * @throws TransportExceptionInterface
     */
@@ -108,12 +110,14 @@ class EmailService
        string|array $target,
        string $subject,
        string $html,
-        array $cc = []
+        array $cc = [],
+        int $priority = Email::PRIORITY_NORMAL
    ): bool {
        $email = (new Email())
            ->from(Address::create($this->from))
            ->to(...(is_array($target) ? $target : [$target]))
            ->cc(...$cc)
+            ->priority($priority)
            ->subject($subject)
            ->html($html);

--- a/src/Traits/RestfulList.php
+++ b/src/Traits/RestfulList.php
@@ -12,6 +12,7 @@ namespace Singularity\HDK\Core\Traits;
 use Closure;
 use Hyperf\Contract\LengthAwarePaginatorInterface;
 use Hyperf\Database\Model\Builder;
+use Hyperf\Database\Model\Relations\Relation;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\Stringable\Str;
@@ -26,12 +27,14 @@ trait RestfulList

    protected function restSelect(Closure $callback, ?Closure $filter = null)
    {
-        $options = [];
-        $result = $this->parseParameters(function ($query, $parsedOptions) use ($callback, &$options) {
-            $options = $parsedOptions;
-            return $callback($query, $parsedOptions);
-        });
-        return $this->responseFormatter($options, $result, $filter);
+        $parsed_options = [];
+        $result = $this->parseParameters(
+            callback: function ($query, $options) use ($callback, &$parsed_options) {
+                $parsed_options = $options;
+                return $callback($query, $options);
+            }
+        );
+        return $this->responseFormatter($parsed_options, $result, $filter);
    }

    protected function parseParameters(Closure $callback): mixed
@@ -51,7 +54,7 @@ trait RestfulList

    protected function responseFormatter(
        array $options,
-        Builder $builder,
+        Builder|Relation $builder,
        ?Closure $filter = null
    ) {
        $perPage = $options['size'] ?? null;
Author	SHA1	Message	Date
李东云	a46659f62b	chore(release): 1.0.0-alpha.11	2023-10-17 02:55:37 +00:00
李东云	f80da66185	ci(docker): 兼容 ext-redis:6.0 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-17 10:55:26 +08:00
李东云	4e5b0fdbb4	chore(release): 1.0.0-alpha.10	2023-10-16 09:36:18 +00:00
李东云	17c0518680	feat(rest): 增加多表关联的兼容 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-16 17:35:30 +08:00
李东云	37d42c17cc	build(composer): 更新依赖 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-16 17:34:24 +08:00
李东云	12e99604c9	build(script): root 用户可以使用 composer Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-16 17:31:24 +08:00
李东云	217178003a	chore(release): 1.0.0-alpha.9	2023-10-13 07:40:37 +00:00
李东云	359b13e718	build(config): 更新了默认的发件邮箱 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-13 15:40:06 +08:00
李东云	e9927fafb1	build(composer): 更新依赖 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-08 15:45:44 +08:00
李东云	02655228ae	chore(release): 1.0.0-alpha.8	2023-10-08 07:44:10 +00:00
李东云	9f7d4effb7	feat(email): 增加了对邮件优先级的兼容 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-10-08 15:43:47 +08:00
李东云	5980ea773b	chore(release): 1.0.0-alpha.7	2023-09-28 08:06:29 +00:00
李东云	110679448f	fix(rest): 修复不存在的具名参数 Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>	2023-09-28 15:50:47 +08:00