From 428a44a61449816b1530dae553e394047f057a02 Mon Sep 17 00:00:00 2001
From: gzydong <837215079@qq.com>
Date: Sat, 22 Jan 2022 20:08:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=BC=E5=AE=B9=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Cache/IpAddressCache.php                        |  2 +-
 app/Command/TestCommand.php                         |  2 +-
 app/{Constants => Constant}/FileDriveConstant.php   |  2 +-
 app/{Constants => Constant}/MediaTypeConstant.php   |  2 +-
 app/{Constants => Constant}/RedisSubscribeChan.php  |  2 +-
 app/{Constants => Constant}/ResponseCode.php        |  2 +-
 app/{Constants => Constant}/RobotConstant.php       |  2 +-
 app/{Constants => Constant}/SmsConstant.php         |  2 +-
 app/{Constants => Constant}/TalkEventConstant.php   |  2 +-
 app/{Constants => Constant}/TalkMessageType.php     |  2 +-
 app/{Constants => Constant}/TalkModeConstant.php    |  2 +-
 app/Controller/AbstractController.php               |  2 +-
 app/Controller/Api/V1/Article/AnnexController.php   |  4 ++--
 app/Controller/Api/V1/Article/ArticleController.php |  2 +-
 app/Controller/Api/V1/AuthController.php            |  2 +-
 app/Controller/Api/V1/CommonController.php          |  2 +-
 app/Controller/Api/V1/Contact/ContactController.php |  2 +-
 app/Controller/Api/V1/Group/GroupController.php     |  2 +-
 app/Controller/Api/V1/Talk/MessageController.php    |  6 +++---
 app/Controller/Api/V1/Talk/RecordsController.php    |  6 +++---
 app/Controller/Api/V1/Talk/TalkController.php       |  2 +-
 app/Controller/Api/V1/UsersController.php           |  4 ++--
 app/Controller/WebSocketController.php              |  2 +-
 app/Exception/Handler/AppExceptionHandler.php       |  2 +-
 app/{Helpers => Helper}/ArrayHelper.php             |  4 ++--
 app/{Helpers => Helper}/DateHelper.php              |  2 +-
 app/{Helpers => Helper}/HashHelper.php              |  2 +-
 app/{Helpers => Helper}/HashIdsHelper.php           |  2 +-
 app/{Helpers => Helper}/JsonHelper.php              |  2 +-
 app/{Helpers => Helper}/RegularHelper.php           |  2 +-
 app/{Helpers => Helper}/StringHelper.php            |  2 +-
 app/Listener/ValidatorFactoryResolvedListener.php   |  2 +-
 app/Process/RedisWebsocketSubscribe.php             |  2 +-
 app/Repository/ExampleRepository.php                |  2 +-
 app/Service/Contact/ContactApplyService.php         |  2 +-
 app/Service/EmoticonService.php                     |  4 ++--
 app/Service/Group/GroupService.php                  |  6 +++---
 app/Service/Message/FormatMessageService.php        |  2 +-
 app/Service/Message/ReceiveHandleService.php        |  4 ++--
 app/Service/Message/SubscribeHandleService.php      |  4 ++--
 app/Service/RobotService.php                        |  2 +-
 app/Service/SplitUploadService.php                  |  2 +-
 app/Service/TalkForwardService.php                  |  4 ++--
 app/Service/TalkMessageService.php                  | 10 +++++-----
 app/Service/TalkService.php                         |  6 +++---
 app/Service/TalkSessionService.php                  |  2 +-
 app/Service/UserService.php                         |  2 +-
 app/Support/Message.php                             |  2 +-
 app/Support/Response.php                            |  2 +-
 app/Support/UserRelation.php                        |  2 +-
 app/Traits/RepositoryTrait.php                      |  2 +-
 seeders/initialize.php                              |  4 ++--
 test/Cases/Helper/ArrayHelperTest.php               |  2 +-
 test/Cases/Helper/RegularHelperTest.php             |  2 +-
 54 files changed, 74 insertions(+), 74 deletions(-)
 rename app/{Constants => Constant}/FileDriveConstant.php (84%)
 rename app/{Constants => Constant}/MediaTypeConstant.php (97%)
 rename app/{Constants => Constant}/RedisSubscribeChan.php (86%)
 rename app/{Constants => Constant}/ResponseCode.php (93%)
 rename app/{Constants => Constant}/RobotConstant.php (89%)
 rename app/{Constants => Constant}/SmsConstant.php (91%)
 rename app/{Constants => Constant}/TalkEventConstant.php (97%)
 rename app/{Constants => Constant}/TalkMessageType.php (97%)
 rename app/{Constants => Constant}/TalkModeConstant.php (93%)
 rename app/{Helpers => Helper}/ArrayHelper.php (86%)
 rename app/{Helpers => Helper}/DateHelper.php (96%)
 rename app/{Helpers => Helper}/HashHelper.php (96%)
 rename app/{Helpers => Helper}/HashIdsHelper.php (98%)
 rename app/{Helpers => Helper}/JsonHelper.php (95%)
 rename app/{Helpers => Helper}/RegularHelper.php (97%)
 rename app/{Helpers => Helper}/StringHelper.php (98%)

diff --git a/app/Cache/IpAddressCache.php b/app/Cache/IpAddressCache.php
index d363158..58c8d9c 100644
--- a/app/Cache/IpAddressCache.php
+++ b/app/Cache/IpAddressCache.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Cache;
 
 use App\Cache\Repository\HashRedis;
-use App\Helpers\JsonHelper;
+use App\Helper\JsonHelper;
 use App\Support\IpAddress;
 
 class IpAddressCache extends HashRedis
diff --git a/app/Command/TestCommand.php b/app/Command/TestCommand.php
index 97eb535..76af0ce 100644
--- a/app/Command/TestCommand.php
+++ b/app/Command/TestCommand.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Command;
 
 use App\Cache\IpAddressCache;
-use App\Constants\RobotConstant;
+use App\Constant\RobotConstant;
 use App\Model\Contact\Contact;
 use App\Repository\ExampleRepository;
 use App\Repository\RobotRepository;
diff --git a/app/Constants/FileDriveConstant.php b/app/Constant/FileDriveConstant.php
similarity index 84%
rename from app/Constants/FileDriveConstant.php
rename to app/Constant/FileDriveConstant.php
index b7b8eef..cf5a86c 100644
--- a/app/Constants/FileDriveConstant.php
+++ b/app/Constant/FileDriveConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 class FileDriveConstant
 {
diff --git a/app/Constants/MediaTypeConstant.php b/app/Constant/MediaTypeConstant.php
similarity index 97%
rename from app/Constants/MediaTypeConstant.php
rename to app/Constant/MediaTypeConstant.php
index 5c96669..78d165e 100644
--- a/app/Constants/MediaTypeConstant.php
+++ b/app/Constant/MediaTypeConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * Class MediaTypeConstant
diff --git a/app/Constants/RedisSubscribeChan.php b/app/Constant/RedisSubscribeChan.php
similarity index 86%
rename from app/Constants/RedisSubscribeChan.php
rename to app/Constant/RedisSubscribeChan.php
index 14621d2..d56227e 100644
--- a/app/Constants/RedisSubscribeChan.php
+++ b/app/Constant/RedisSubscribeChan.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 class RedisSubscribeChan
 {
diff --git a/app/Constants/ResponseCode.php b/app/Constant/ResponseCode.php
similarity index 93%
rename from app/Constants/ResponseCode.php
rename to app/Constant/ResponseCode.php
index edaa7f4..b2ce2e3 100644
--- a/app/Constants/ResponseCode.php
+++ b/app/Constant/ResponseCode.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * HTTP 响应状态码枚举
diff --git a/app/Constants/RobotConstant.php b/app/Constant/RobotConstant.php
similarity index 89%
rename from app/Constants/RobotConstant.php
rename to app/Constant/RobotConstant.php
index c20ea08..cead16d 100644
--- a/app/Constants/RobotConstant.php
+++ b/app/Constant/RobotConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * 定义系统机器人ID
diff --git a/app/Constants/SmsConstant.php b/app/Constant/SmsConstant.php
similarity index 91%
rename from app/Constants/SmsConstant.php
rename to app/Constant/SmsConstant.php
index 3be8595..a34b7a1 100644
--- a/app/Constants/SmsConstant.php
+++ b/app/Constant/SmsConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 class SmsConstant
 {
diff --git a/app/Constants/TalkEventConstant.php b/app/Constant/TalkEventConstant.php
similarity index 97%
rename from app/Constants/TalkEventConstant.php
rename to app/Constant/TalkEventConstant.php
index 1390620..d960789 100644
--- a/app/Constants/TalkEventConstant.php
+++ b/app/Constant/TalkEventConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * WebSocket 消息事件枚举
diff --git a/app/Constants/TalkMessageType.php b/app/Constant/TalkMessageType.php
similarity index 97%
rename from app/Constants/TalkMessageType.php
rename to app/Constant/TalkMessageType.php
index e02a5ba..c0523cd 100644
--- a/app/Constants/TalkMessageType.php
+++ b/app/Constant/TalkMessageType.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * Class TalkMessageType
diff --git a/app/Constants/TalkModeConstant.php b/app/Constant/TalkModeConstant.php
similarity index 93%
rename from app/Constants/TalkModeConstant.php
rename to app/Constant/TalkModeConstant.php
index c40e05a..bf8bc0d 100644
--- a/app/Constants/TalkModeConstant.php
+++ b/app/Constant/TalkModeConstant.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Constants;
+namespace App\Constant;
 
 /**
  * 聊天对话模式
diff --git a/app/Controller/AbstractController.php b/app/Controller/AbstractController.php
index b3fb4a2..85dd360 100644
--- a/app/Controller/AbstractController.php
+++ b/app/Controller/AbstractController.php
@@ -18,7 +18,7 @@ use Hyperf\HttpServer\Contract\ResponseInterface;
 use Psr\Container\ContainerInterface;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Exception\ValidateException;
-use App\Constants\ResponseCode;
+use App\Constant\ResponseCode;
 
 abstract class AbstractController
 {
diff --git a/app/Controller/Api/V1/Article/AnnexController.php b/app/Controller/Api/V1/Article/AnnexController.php
index 8b7fcde..9db9ce3 100644
--- a/app/Controller/Api/V1/Article/AnnexController.php
+++ b/app/Controller/Api/V1/Article/AnnexController.php
@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 namespace App\Controller\Api\V1\Article;
 
-use App\Constants\FileDriveConstant;
+use App\Constant\FileDriveConstant;
 use App\Controller\Api\V1\CController;
-use App\Helpers\DateHelper;
+use App\Helper\DateHelper;
 use App\Model\Article\ArticleAnnex;
 use App\Service\ArticleService;
 use Hyperf\Di\Annotation\Inject;
diff --git a/app/Controller/Api/V1/Article/ArticleController.php b/app/Controller/Api/V1/Article/ArticleController.php
index 98e7cf3..617cf07 100644
--- a/app/Controller/Api/V1/Article/ArticleController.php
+++ b/app/Controller/Api/V1/Article/ArticleController.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Controller\Api\V1\Article;
 
 use App\Controller\Api\V1\CController;
-use App\Helpers\StringHelper;
+use App\Helper\StringHelper;
 use App\Service\ArticleService;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\Controller;
diff --git a/app/Controller/Api/V1/AuthController.php b/app/Controller/Api/V1/AuthController.php
index 61468d8..95c17cc 100644
--- a/app/Controller/Api/V1/AuthController.php
+++ b/app/Controller/Api/V1/AuthController.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Controller\Api\V1;
 
-use App\Constants\SmsConstant;
+use App\Constant\SmsConstant;
 use App\Event\LoginEvent;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\Controller;
diff --git a/app/Controller/Api/V1/CommonController.php b/app/Controller/Api/V1/CommonController.php
index 0a8b1f2..b0064eb 100644
--- a/app/Controller/Api/V1/CommonController.php
+++ b/app/Controller/Api/V1/CommonController.php
@@ -9,7 +9,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\Controller;
 use Hyperf\HttpServer\Annotation\RequestMapping;
 use App\Service\SmsCodeService;
-use App\Constants\SmsConstant;
+use App\Constant\SmsConstant;
 use App\Service\UserService;
 
 /**
diff --git a/app/Controller/Api/V1/Contact/ContactController.php b/app/Controller/Api/V1/Contact/ContactController.php
index 7d9b5f1..a729e2e 100644
--- a/app/Controller/Api/V1/Contact/ContactController.php
+++ b/app/Controller/Api/V1/Contact/ContactController.php
@@ -4,7 +4,7 @@ namespace App\Controller\Api\V1\Contact;
 
 use App\Cache\FriendRemark;
 use App\Cache\ServerRunID;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkModeConstant;
 use App\Controller\Api\V1\CController;
 use App\Middleware\JWTAuthMiddleware;
 use App\Repository\Contact\ContactRepository;
diff --git a/app/Controller/Api/V1/Group/GroupController.php b/app/Controller/Api/V1/Group/GroupController.php
index 4c15232..fb5b07d 100644
--- a/app/Controller/Api/V1/Group/GroupController.php
+++ b/app/Controller/Api/V1/Group/GroupController.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Controller\Api\V1\Group;
 
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkModeConstant;
 use App\Controller\Api\V1\CController;
 use App\Model\Group\Group;
 use App\Model\Group\GroupNotice;
diff --git a/app/Controller/Api/V1/Talk/MessageController.php b/app/Controller/Api/V1/Talk/MessageController.php
index d2ff5ce..f140e32 100644
--- a/app/Controller/Api/V1/Talk/MessageController.php
+++ b/app/Controller/Api/V1/Talk/MessageController.php
@@ -4,9 +4,9 @@ declare(strict_types=1);
 namespace App\Controller\Api\V1\Talk;
 
 use App\Cache\UnreadTalkCache;
-use App\Constants\MediaTypeConstant;
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkModeConstant;
+use App\Constant\MediaTypeConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkModeConstant;
 use App\Controller\Api\V1\CController;
 use App\Event\TalkEvent;
 use App\Model\Emoticon\EmoticonItem;
diff --git a/app/Controller/Api/V1/Talk/RecordsController.php b/app/Controller/Api/V1/Talk/RecordsController.php
index 7dfc833..eeae2ca 100644
--- a/app/Controller/Api/V1/Talk/RecordsController.php
+++ b/app/Controller/Api/V1/Talk/RecordsController.php
@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 namespace App\Controller\Api\V1\Talk;
 
-use App\Constants\FileDriveConstant;
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\FileDriveConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Controller\Api\V1\CController;
 use App\Model\Talk\TalkRecords;
 use App\Model\Talk\TalkRecordsFile;
diff --git a/app/Controller/Api/V1/Talk/TalkController.php b/app/Controller/Api/V1/Talk/TalkController.php
index 8535c32..c823eb4 100644
--- a/app/Controller/Api/V1/Talk/TalkController.php
+++ b/app/Controller/Api/V1/Talk/TalkController.php
@@ -6,7 +6,7 @@ namespace App\Controller\Api\V1\Talk;
 use App\Cache\LastMessage;
 use App\Cache\Repository\LockRedis;
 use App\Cache\UnreadTalkCache;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkModeConstant;
 use App\Controller\Api\V1\CController;
 use App\Model\Group\Group;
 use App\Model\Talk\TalkSession;
diff --git a/app/Controller/Api/V1/UsersController.php b/app/Controller/Api/V1/UsersController.php
index 6075f05..b6b09c8 100644
--- a/app/Controller/Api/V1/UsersController.php
+++ b/app/Controller/Api/V1/UsersController.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Controller\Api\V1;
 
-use App\Constants\SmsConstant;
+use App\Constant\SmsConstant;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\Controller;
 use Hyperf\HttpServer\Annotation\RequestMapping;
@@ -11,7 +11,7 @@ use Hyperf\HttpServer\Annotation\Middleware;
 use App\Middleware\JWTAuthMiddleware;
 use App\Model\User;
 use App\Support\SendEmailCode;
-use App\Helpers\HashHelper;
+use App\Helper\HashHelper;
 use App\Service\UserService;
 use App\Service\SmsCodeService;
 use Psr\Http\Message\ResponseInterface;
diff --git a/app/Controller/WebSocketController.php b/app/Controller/WebSocketController.php
index a8addad..cd0b044 100644
--- a/app/Controller/WebSocketController.php
+++ b/app/Controller/WebSocketController.php
@@ -16,7 +16,7 @@ use App\Cache\SocketRoom;
 use App\Service\Group\GroupMemberService;
 use App\Service\Message\ReceiveHandleService;
 use Hyperf\Di\Annotation\Inject;
-use App\Constants\TalkEventConstant;
+use App\Constant\TalkEventConstant;
 use Hyperf\Contract\OnCloseInterface;
 use Hyperf\Contract\OnMessageInterface;
 use Hyperf\Contract\OnOpenInterface;
diff --git a/app/Exception/Handler/AppExceptionHandler.php b/app/Exception/Handler/AppExceptionHandler.php
index 6e9ac75..c244ec2 100644
--- a/app/Exception/Handler/AppExceptionHandler.php
+++ b/app/Exception/Handler/AppExceptionHandler.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Exception\Handler;
 
 use App\Cache\Repository\LockRedis;
-use App\Constants\ResponseCode;
+use App\Constant\ResponseCode;
 use App\Templates\MailerTemplate;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\ExceptionHandler\ExceptionHandler;
diff --git a/app/Helpers/ArrayHelper.php b/app/Helper/ArrayHelper.php
similarity index 86%
rename from app/Helpers/ArrayHelper.php
rename to app/Helper/ArrayHelper.php
index 4f79565..e9a9281 100644
--- a/app/Helpers/ArrayHelper.php
+++ b/app/Helper/ArrayHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 class ArrayHelper
 {
@@ -31,7 +31,7 @@ class ArrayHelper
      * @param int    $sort  排序方式
      * @return array
      */
-    public static function sort(array $array, string $field, $sort = SORT_DESC): array
+    public static function sort(array $array, string $field, int $sort = SORT_DESC): array
     {
         array_multisort(array_column($array, $field), $sort, $array);
         return $array;
diff --git a/app/Helpers/DateHelper.php b/app/Helper/DateHelper.php
similarity index 96%
rename from app/Helpers/DateHelper.php
rename to app/Helper/DateHelper.php
index d07adcd..87a0800 100644
--- a/app/Helpers/DateHelper.php
+++ b/app/Helper/DateHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 /**
  * 时间处理助手
diff --git a/app/Helpers/HashHelper.php b/app/Helper/HashHelper.php
similarity index 96%
rename from app/Helpers/HashHelper.php
rename to app/Helper/HashHelper.php
index 0600714..15a44d7 100644
--- a/app/Helpers/HashHelper.php
+++ b/app/Helper/HashHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 /**
  * Hash 密码加密辅助类
diff --git a/app/Helpers/HashIdsHelper.php b/app/Helper/HashIdsHelper.php
similarity index 98%
rename from app/Helpers/HashIdsHelper.php
rename to app/Helper/HashIdsHelper.php
index 3abe5b6..e40054c 100644
--- a/app/Helpers/HashIdsHelper.php
+++ b/app/Helper/HashIdsHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 use Hashids\Hashids;
 
diff --git a/app/Helpers/JsonHelper.php b/app/Helper/JsonHelper.php
similarity index 95%
rename from app/Helpers/JsonHelper.php
rename to app/Helper/JsonHelper.php
index 7abd169..8019d5b 100644
--- a/app/Helpers/JsonHelper.php
+++ b/app/Helper/JsonHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 /**
  * Json 字符串助手
diff --git a/app/Helpers/RegularHelper.php b/app/Helper/RegularHelper.php
similarity index 97%
rename from app/Helpers/RegularHelper.php
rename to app/Helper/RegularHelper.php
index b822571..9a3d901 100644
--- a/app/Helpers/RegularHelper.php
+++ b/app/Helper/RegularHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 /**
  * 正则验证助手
diff --git a/app/Helpers/StringHelper.php b/app/Helper/StringHelper.php
similarity index 98%
rename from app/Helpers/StringHelper.php
rename to app/Helper/StringHelper.php
index d2e1295..9b599c0 100644
--- a/app/Helpers/StringHelper.php
+++ b/app/Helper/StringHelper.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace App\Helpers;
+namespace App\Helper;
 
 /**
  * 字符串助手类
diff --git a/app/Listener/ValidatorFactoryResolvedListener.php b/app/Listener/ValidatorFactoryResolvedListener.php
index 84488ac..df5a6ff 100644
--- a/app/Listener/ValidatorFactoryResolvedListener.php
+++ b/app/Listener/ValidatorFactoryResolvedListener.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Listener;
 
-use App\Helpers\RegularHelper;
+use App\Helper\RegularHelper;
 use Hyperf\Event\Contract\ListenerInterface;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Validation\Event\ValidatorFactoryResolved;
diff --git a/app/Process/RedisWebsocketSubscribe.php b/app/Process/RedisWebsocketSubscribe.php
index 19492d9..e59ed99 100644
--- a/app/Process/RedisWebsocketSubscribe.php
+++ b/app/Process/RedisWebsocketSubscribe.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Process;
 
-use App\Constants\RedisSubscribeChan;
+use App\Constant\RedisSubscribeChan;
 use App\Service\Message\SubscribeHandleService;
 use Hyperf\Process\AbstractProcess;
 use Hyperf\Process\Annotation\Process;
diff --git a/app/Repository/ExampleRepository.php b/app/Repository/ExampleRepository.php
index 631c9c0..648397e 100644
--- a/app/Repository/ExampleRepository.php
+++ b/app/Repository/ExampleRepository.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Repository;
 
-use App\Helpers\HashHelper;
+use App\Helper\HashHelper;
 use App\Model\Talk\TalkRecords;
 use App\Model\User;
 use Hyperf\Utils\Str;
diff --git a/app/Service/Contact/ContactApplyService.php b/app/Service/Contact/ContactApplyService.php
index ac83476..472d775 100644
--- a/app/Service/Contact/ContactApplyService.php
+++ b/app/Service/Contact/ContactApplyService.php
@@ -3,7 +3,7 @@
 namespace App\Service\Contact;
 
 use App\Cache\FriendApply;
-use App\Constants\TalkEventConstant;
+use App\Constant\TalkEventConstant;
 use App\Event\TalkEvent;
 use App\Model\Contact\Contact;
 use App\Model\Contact\ContactApply;
diff --git a/app/Service/EmoticonService.php b/app/Service/EmoticonService.php
index a7b416e..e8a3dd5 100644
--- a/app/Service/EmoticonService.php
+++ b/app/Service/EmoticonService.php
@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Model\Talk\TalkRecords;
 use App\Model\Talk\TalkRecordsFile;
 use App\Model\Emoticon\EmoticonItem;
diff --git a/app/Service/Group/GroupService.php b/app/Service/Group/GroupService.php
index 03b6c1d..1631f7d 100644
--- a/app/Service/Group/GroupService.php
+++ b/app/Service/Group/GroupService.php
@@ -5,9 +5,9 @@ namespace App\Service\Group;
 
 use App\Cache\LastMessage;
 use App\Cache\SocketRoom;
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Event\TalkEvent;
 use App\Model\Talk\TalkRecords;
 use App\Model\Talk\TalkRecordsInvite;
diff --git a/app/Service/Message/FormatMessageService.php b/app/Service/Message/FormatMessageService.php
index 88970f5..9a92a91 100644
--- a/app/Service/Message/FormatMessageService.php
+++ b/app/Service/Message/FormatMessageService.php
@@ -5,7 +5,7 @@ namespace App\Service\Message;
 
 use App\Cache\VoteCache;
 use App\Cache\VoteStatisticsCache;
-use App\Constants\TalkMessageType;
+use App\Constant\TalkMessageType;
 use App\Model\Talk\TalkRecordsCode;
 use App\Model\Talk\TalkRecordsFile;
 use App\Model\Talk\TalkRecordsForward;
diff --git a/app/Service/Message/ReceiveHandleService.php b/app/Service/Message/ReceiveHandleService.php
index 7509264..51c22fd 100644
--- a/app/Service/Message/ReceiveHandleService.php
+++ b/app/Service/Message/ReceiveHandleService.php
@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace App\Service\Message;
 
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkModeConstant;
 use App\Event\TalkEvent;
 use App\Service\SocketClientService;
 use App\Service\TalkMessageService;
diff --git a/app/Service/Message/SubscribeHandleService.php b/app/Service/Message/SubscribeHandleService.php
index 56787f9..707c225 100644
--- a/app/Service/Message/SubscribeHandleService.php
+++ b/app/Service/Message/SubscribeHandleService.php
@@ -5,8 +5,8 @@ namespace App\Service\Message;
 
 use App\Cache\GroupCache;
 use App\Cache\SocketRoom;
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkModeConstant;
 use App\Model\Talk\TalkRecords;
 use App\Model\User;
 use App\Model\Contact\ContactApply;
diff --git a/app/Service/RobotService.php b/app/Service/RobotService.php
index 9d36531..80701b1 100644
--- a/app/Service/RobotService.php
+++ b/app/Service/RobotService.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Helpers\HashHelper;
+use App\Helper\HashHelper;
 use App\Model\Robot;
 use App\Model\User;
 use Hyperf\DbConnection\Db;
diff --git a/app/Service/SplitUploadService.php b/app/Service/SplitUploadService.php
index cc91eff..d3062e8 100644
--- a/app/Service/SplitUploadService.php
+++ b/app/Service/SplitUploadService.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Constants\FileDriveConstant;
+use App\Constant\FileDriveConstant;
 use App\Model\SplitUpload;
 use Hyperf\HttpMessage\Upload\UploadedFile;
 use League\Flysystem\Filesystem;
diff --git a/app/Service/TalkForwardService.php b/app/Service/TalkForwardService.php
index 71bda73..4438028 100644
--- a/app/Service/TalkForwardService.php
+++ b/app/Service/TalkForwardService.php
@@ -6,8 +6,8 @@ namespace App\Service;
 use App\Model\Talk\TalkRecordsCode;
 use App\Model\Talk\TalkRecordsFile;
 use Exception;
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Model\Talk\TalkRecords;
 use App\Model\Talk\TalkRecordsForward;
 use Hyperf\DbConnection\Db;
diff --git a/app/Service/TalkMessageService.php b/app/Service/TalkMessageService.php
index 390f3f2..f596828 100644
--- a/app/Service/TalkMessageService.php
+++ b/app/Service/TalkMessageService.php
@@ -7,10 +7,10 @@ use App\Cache\LastMessage;
 use App\Cache\UnreadTalkCache;
 use App\Cache\VoteCache;
 use App\Cache\VoteStatisticsCache;
-use App\Constants\RobotConstant;
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\RobotConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Event\TalkEvent;
 use App\Model\Group\GroupMember;
 use App\Model\Talk\TalkRecordsCode;
@@ -20,7 +20,7 @@ use App\Model\Talk\TalkRecordsVoteAnswer;
 use App\Repository\RobotRepository;
 use App\Support\UserRelation;
 use Exception;
-use App\Constants\MediaTypeConstant;
+use App\Constant\MediaTypeConstant;
 use App\Model\Talk\TalkRecords;
 use App\Model\Talk\TalkRecordsFile;
 use Hyperf\DbConnection\Db;
diff --git a/app/Service/TalkService.php b/app/Service/TalkService.php
index ac95bd3..08cca4d 100644
--- a/app/Service/TalkService.php
+++ b/app/Service/TalkService.php
@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 namespace App\Service;
 
-use App\Constants\TalkEventConstant;
-use App\Constants\TalkMessageType;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkEventConstant;
+use App\Constant\TalkMessageType;
+use App\Constant\TalkModeConstant;
 use App\Event\TalkEvent;
 use App\Model\Robot;
 use App\Service\Group\GroupMemberService;
diff --git a/app/Service/TalkSessionService.php b/app/Service/TalkSessionService.php
index 7b41e59..89ef555 100644
--- a/app/Service/TalkSessionService.php
+++ b/app/Service/TalkSessionService.php
@@ -6,7 +6,7 @@ namespace App\Service;
 use App\Cache\LastMessage;
 use App\Cache\ServerRunID;
 use App\Cache\UnreadTalkCache;
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkModeConstant;
 use App\Model\Talk\TalkSession;
 use App\Repository\Talk\TalkSessionRepository;
 use Carbon\Carbon;
diff --git a/app/Service/UserService.php b/app/Service/UserService.php
index df67875..cb2e01c 100644
--- a/app/Service/UserService.php
+++ b/app/Service/UserService.php
@@ -2,7 +2,7 @@
 
 namespace App\Service;
 
-use App\Helpers\HashHelper;
+use App\Helper\HashHelper;
 use App\Model\Contact\ContactApply;
 use App\Repository\Article\ArticleClassRepository;
 use App\Repository\UserRepository;
diff --git a/app/Support/Message.php b/app/Support/Message.php
index 4af7424..de8692b 100644
--- a/app/Support/Message.php
+++ b/app/Support/Message.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Support;
 
-use App\Constants\RedisSubscribeChan;
+use App\Constant\RedisSubscribeChan;
 
 class Message
 {
diff --git a/app/Support/Response.php b/app/Support/Response.php
index e5765bb..74e6436 100644
--- a/app/Support/Response.php
+++ b/app/Support/Response.php
@@ -6,7 +6,7 @@ namespace App\Support;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
-use App\Constants\ResponseCode;
+use App\Constant\ResponseCode;
 
 class Response
 {
diff --git a/app/Support/UserRelation.php b/app/Support/UserRelation.php
index 25bd79a..b7ca70e 100644
--- a/app/Support/UserRelation.php
+++ b/app/Support/UserRelation.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Support;
 
-use App\Constants\TalkModeConstant;
+use App\Constant\TalkModeConstant;
 use App\Service\Group\GroupMemberService;
 use App\Service\UserFriendService;
 
diff --git a/app/Traits/RepositoryTrait.php b/app/Traits/RepositoryTrait.php
index 6317001..ed58849 100644
--- a/app/Traits/RepositoryTrait.php
+++ b/app/Traits/RepositoryTrait.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Traits;
 
-use App\Helpers\ArrayHelper;
+use App\Helper\ArrayHelper;
 use Hyperf\Database\Model\Builder;
 use Hyperf\Database\Model\Model;
 use Hyperf\DbConnection\Db;
diff --git a/seeders/initialize.php b/seeders/initialize.php
index f359c02..225d0df 100644
--- a/seeders/initialize.php
+++ b/seeders/initialize.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Helpers\HashHelper;
+use App\Helper\HashHelper;
 use Hyperf\Database\Seeders\Seeder;
 use App\Model\User;
 use App\Model\Article\ArticleClass;
@@ -69,7 +69,7 @@ class Initialize extends Seeder
 
         $service = new \App\Service\TalkSessionService();
         foreach ($list as $item) {
-            $service->create($item->user_id, $item->friend_id, \App\Constants\TalkModeConstant::PRIVATE_CHAT);
+            $service->create($item->user_id, $item->friend_id, \App\Constant\TalkModeConstant::PRIVATE_CHAT);
         }
     }
 }
diff --git a/test/Cases/Helper/ArrayHelperTest.php b/test/Cases/Helper/ArrayHelperTest.php
index fc91cb4..51ca8d5 100644
--- a/test/Cases/Helper/ArrayHelperTest.php
+++ b/test/Cases/Helper/ArrayHelperTest.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace HyperfTest\Cases\Helper;
 
 
-use App\Helpers\ArrayHelper;
+use App\Helper\ArrayHelper;
 use HyperfTest\HttpTestCase;
 
 class ArrayHelperTest extends HttpTestCase
diff --git a/test/Cases/Helper/RegularHelperTest.php b/test/Cases/Helper/RegularHelperTest.php
index e94081f..b2a5c6d 100644
--- a/test/Cases/Helper/RegularHelperTest.php
+++ b/test/Cases/Helper/RegularHelperTest.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace HyperfTest\Cases\Helper;
 
-use App\Helpers\RegularHelper;
+use App\Helper\RegularHelper;
 use HyperfTest\HttpTestCase;
 
 class RegularHelperTest extends HttpTestCase