Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	.gitignore
#	composer.lock

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": "865e38bae84e7de0c95098cc87135440",
+    "content-hash": "ac2fa5a625069729975d072614509e1f",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -18,7 +18,13 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/483dd0b8bff5d47f0e4ffc99f6077a295c5ccbb5",
                 "reference": "483dd0b8bff5d47f0e4ffc99f6077a295c5ccbb5",
-                "shasum": ""
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
             },
             "require": {
                 "php": ">=5.3"
@@ -7129,7 +7135,77 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-11-12T01:36:20+00:00"
+            "time": "2025-06-12T13:34:04+00:00"
+        },
+        {
+            "name": "zoujingli/ip2region",
+            "version": "v3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zoujingli/ip2region.git",
+                "reference": "fd31d7a023f28f4e2f3e63f46f1fd51f8b2672f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/fd31d7a023f28f4e2f3e63f46f1fd51f8b2672f6",
+                "reference": "fd31d7a023f28f4e2f3e63f46f1fd51f8b2672f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4"
+            },
+            "suggest": {
+                "ext-opcache": "启用 OPcache 以获得更好的性能"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "ip2region.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Anyon",
+                    "email": "zoujingli@qq.com",
+                    "homepage": "https://thinkadmin.top"
+                }
+            ],
+            "description": "Ip2Region v3.0 for PHP - 企业级 IP 地理位置查询库，支持 IPv4/IPv6，分片文件管理，智能缓存，零依赖",
+            "homepage": "https://github.com/zoujingli/Ip2Region",
+            "keywords": [
+                "IP",
+                "IP定位",
+                "Ip2Region",
+                "geoip",
+                "geolocation",
+                "ipv4",
+                "ipv6",
+                "location",
+                "企业级",
+                "分片数据库",
+                "压缩",
+                "地理位置",
+                "地理位置查询",
+                "缓存",
+                "高性能"
+            ],
+            "support": {
+                "issues": "https://github.com/zoujingli/ip2region/issues",
+                "source": "https://github.com/zoujingli/ip2region/tree/v3.0.0"
+            },
+            "time": "2025-09-15T12:27:22+00:00"
         }
     ],
     "packages-dev": [],