3

app/Module/App/Mnemon.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\App;
 
-use App\Module\Ulogic\Enum\WalletAddressType;
+use App\Module\Ulogic\Enum\WALLET_ADDRESS_TYPE;
 use App\Module\Ulogic\Model\WalletAddress;
 use App\Module\Ulogic\Services\UserRelationService;
 use App\Module\User\Model\User;

app/Module/App/Service/AddressService.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\App\Service;
 
-use App\Module\Ulogic\Enum\UserAddressType;
+use App\Module\Ulogic\Enum\USER_ADDRESS_TYPE;
 use App\Module\Ulogic\Services\UserAddressService;
 use Uraus\App\WalletAddress;
 
@@ -17,9 +17,9 @@ class AddressService
     public static function list($userId, $type)
     {
         $map = [
-            1 => UserAddressType::URAUS->value(),
-            2 => UserAddressType::USDT->value(),
-            3 => UserAddressType::BNB->value(),
+            1 => USER_ADDRESS_TYPE::URAUS->value(),
+            2 => USER_ADDRESS_TYPE::USDT->value(),
+            3 => USER_ADDRESS_TYPE::BNB->value(),
         ];
 
         $coinType = $map[$type] ?? 0;

app/Module/App/Service/UserService.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\App\Service;
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Service\User;
 use App\Module\Ulogic\Model\WalletAddress;
 use Uraus\App\LastLoginInfo;

app/Module/App/Service/WalletService.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\App\Service;
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Service\User;
 use App\Module\Ulogic\Model\WalletAddress;
 
@@ -11,7 +11,7 @@ class WalletService
     // 账户统计
     public static function stats($userId)
     {
-        $fundIds = [FundType::FUND1->value(), FundType::USD->value(), FundType::BNB->value()];
+        $fundIds = [FUND_TYPE::FUND1->value(), FUND_TYPE::USD->value(), FUND_TYPE::BNB->value()];
         $data = User::getAllAccount($userId, $fundIds);
         $data = array_column($data, 'balance', 'fund_id');
         $address = WalletAddress::getInfoByCondition('user_id', $userId);
@@ -24,9 +24,9 @@ class WalletService
             $address = WalletAddress::getInfoByCondition('user_id', $userId);
         }
         $result = [
-            'uraus' => $data[FundType::FUND1->value()] ?? 0,
-            'usdt' => $data[FundType::USD->value()] ?? 0,
-            'bnb' => $data[FundType::BNB->value()] ?? 0,
+            'uraus' => $data[FUND_TYPE::FUND1->value()] ?? 0,
+            'usdt' => $data[FUND_TYPE::USD->value()] ?? 0,
+            'bnb' => $data[FUND_TYPE::BNB->value()] ?? 0,
             'address' => $address->address
         ];
 
@@ -44,9 +44,9 @@ class WalletService
     {
         // proto枚举
         $map = [
-            1 => FundType::FUND1->value(),
-            2 => FundType::USD->value(),
-            3 => FundType::BNB->value()
+            1 => FUND_TYPE::FUND1->value(),
+            2 => FUND_TYPE::USD->value(),
+            3 => FUND_TYPE::BNB->value()
         ];
 
         $fundId = $map[$type];

app/Module/App/SessionApp.php

@@ -4,7 +4,7 @@ namespace App\Module\App;
 
 
 use App\Module\System\Services\Config;
-use App\Module\Ulogic\Enum\Rule;
+use App\Module\Ulogic\Enum\RULE;
 use App\Module\Ulogic\Unit\User;
 use UCore\Exception\LogicException;
 use UCore\TokenSession;
@@ -106,9 +106,9 @@ class SessionApp extends TokenSession
      * @param User $user
      * @return int
      */
-    static public function getRole(\App\Module\User\Model\User $user): Rule
+    static public function getRole(\App\Module\User\Model\User $user): RULE
     {
-        return Rule::ROLE_USER;
+        return RULE::ROLE_USER;
     }
 
 

app/Module/Article/AdminControllers/ArticleController.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Article\AdminControllers;
 
-use App\Module\Article\Enums\Status;
+use App\Module\Article\Enums\STATUS;
 use App\Module\Article\Models\Article;
 use App\Module\Article\Models\ArticleCate;
 use App\Module\Article\Repositories\ArticleRepositories;
@@ -35,14 +35,14 @@ class ArticleController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('title')->limit(30);
             $grid->column('category_id', '分类')->using(ArticleCate::getCate());
-            $grid->column('status', '状态')->using(Status::getValueDescription());
+            $grid->column('status', '状态')->using(STATUS::getValueDescription());
             $grid->column('created_at')->sortable();
             $grid->column('updated_at')->sortable();
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->like('title', '标题');
                 $filter->equal('category_id', '分类')->select(ArticleCate::getCate());
-                $filter->equal('status', '状态')->select(Status::getValueDescription());
+                $filter->equal('status', '状态')->select(STATUS::getValueDescription());
             });
 
             $grid->actions(function (Grid\Displayers\Actions $actions) {
@@ -59,7 +59,7 @@ class ArticleController extends AdminController
         return Form::make(Article::class, function (Form $form) {
             $form->text('title', '标题')->required();
             $form->radio('category_id', '分类')->options(ArticleCate::getCate())->required();
-            $form->radio('status')->options(Status::getValueDescription());
+            $form->radio('status')->options(STATUS::getValueDescription());
             $form->editor('content', '内容')->required();
             $form->hidden('created_by')->value(Admin::user()->getOriginal('id'));
         });

app/Module/Article/Enums/Status.php → app/Module/Article/Enums/STATUS.php

@@ -5,7 +5,7 @@ namespace App\Module\Article\Enums;
 use UCore\Enum\EnumCore;
 use UCore\Enum\EnumToInt;
 
-enum Status: int
+enum STATUS: int
 {
     use EnumCore;
     use EnumToInt;

app/Module/Article/Models/Article.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Article\Models;
 
-use App\Module\Article\Enums\Status;
+use App\Module\Article\Enums\STATUS;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Module/Dev/AdminControllers/DevController.php

@@ -11,7 +11,7 @@ use App\Http\Controllers\Controller;
 
 
 
-use App\Module\Ulogic\Enum\Rule;
+use App\Module\Ulogic\Enum\RULE;
 
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
@@ -182,7 +182,7 @@ class DevController extends Controller
     public function enums()
     {
         $data                   = [];
-        $data['ConfigType']     = ConfigType::getValueDescription();
+        $data['ConfigType']     = \App\Module\System\Enums\CONFIG_TYPE::getValueDescription();
         $data['ConfigGroup']    = Config::getGroupKv();
         $data['VorderType']     = Type::getValueDescription();
         $data['VorderStatus']   = \App\Module\VOrder\Enums\Status::getValueDescription();
@@ -193,17 +193,17 @@ class DevController extends Controller
         $data['OrderComplaintType']   = \App\Module\Order\Enums\ComplaintType::getValueDescription();
         $data['OrderComplaintHandle'] = \App\Module\Order\Enums\ComplaintHandle::getValueDescription();
 
-        $data['Role']           = Rule::getValueDescription();
+        $data['Role']           = RULE::getValueDescription();
         $data['MerchantStatus'] = Status::getValueDescription();
         $data['MerchantTypes']  = TypeEnums::getValueDescription();
         $data['UserStatus']     = \App\Module\User\Enums\Status::getValueDescription();
         $data['UserStatus2']    = \App\Module\User\Enums\Status2::getValueDescription();
-        $data['UserPunishType'] = \App\Module\Ulogic\Enum\PunishType::getValueDescription();
+        $data['UserPunishType'] = \App\Module\Ulogic\Enum\PUNISH_TYPE::getValueDescription();
         $data['UserAction']     = \App\Module\User\Enums\ActionType::getValueDescription();
 
         $data['GuidanceStatus'] = GuidanceStatus::getValueDescription();
 
-        $data['FundLogType'] = LogType::getValueDescription();
+        $data['FundLogType'] = \App\Module\Fund\Enums\LOG_TYPE::getValueDescription();
 
 
         dump($data);

app/Module/Fund/Enums/ExternalStatus.php → app/Module/Fund/Enums/EXTERNAL_STATUS.php

@@ -7,7 +7,7 @@ use UCore\Enum\EnumName;
 /**
  * 外部调用状态枚举
  */
-enum ExternalStatus: int
+enum EXTERNAL_STATUS: int
 {
     use EnumName;
 

app/Module/Fund/Enums/FundCate.php → app/Module/Fund/Enums/FUND_CATE.php

@@ -5,7 +5,7 @@ namespace App\Module\Fund\Enums;
 use UCore\Enum\EnumCore;
 use UCore\Enum\EnumToInt;
 
-enum FundCate: int
+enum FUND_CATE: int
 {
 
     use EnumToInt, EnumCore;

app/Module/Fund/Enums/FundCurrencyType.php → app/Module/Fund/Enums/FUND_CURRENCY_TYPE.php

@@ -7,7 +7,7 @@ use UCore\Enum\EnumName;
 /**
  * 基金货币类型枚举
  */
-enum FundCurrencyType: int
+enum FUND_CURRENCY_TYPE: int
 {
     use EnumName;
 

app/Module/Fund/Enums/FundStatus.php → app/Module/Fund/Enums/FUND_STATUS.php

@@ -5,7 +5,7 @@ namespace App\Module\Fund\Enums;
 use UCore\Enum\EnumCore;
 use UCore\Enum\EnumToInt;
 
-enum FundStatus: int
+enum FUND_STATUS: int
 {
     use EnumToInt, EnumCore;
 

app/Module/Fund/Enums/FundType.php → app/Module/Fund/Enums/FUND_TYPE.php

@@ -6,7 +6,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToInt;
 
-enum FundType: int
+enum FUND_TYPE: int
 {
     use EnumToInt, EnumCore, EnumExpression;
 

app/Module/Fund/Enums/LogType.php → app/Module/Fund/Enums/LOG_TYPE.php

@@ -7,7 +7,7 @@ use UCore\Enum\EnumName;
 /**
  * 资金日志类型枚举
  */
-enum LogType: int
+enum LOG_TYPE: int
 {
     use EnumName;
 

app/Module/Fund/Enums/OperateType.php → app/Module/Fund/Enums/OPERATE_TYPE.php

@@ -5,7 +5,7 @@ namespace App\Module\Fund\Enums;
 use UCore\Enum\EnumCore;
 use UCore\Enum\EnumToInt;
 
-enum OperateType: int
+enum OPERATE_TYPE: int
 {
     use EnumToInt, EnumCore;
 

app/Module/Fund/Models/FundAdminModel.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Fund\Models;
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use UCore\ModelCore;
 
 class FundAdminModel extends ModelCore
@@ -26,7 +26,7 @@ class FundAdminModel extends ModelCore
     public $timestamps = false;
 
     protected $casts = [
-        'fund_id' => FundType::class,
+        'fund_id' => FUND_TYPE::class,
     ];
 
     /**

app/Module/Fund/Service/User.php

@@ -4,8 +4,8 @@ namespace App\Module\Fund\Service;
 
 
 use App\Module\Fund\CoreService;
-use App\Module\Fund\Enums\FundType;
-use App\Module\Fund\Enums\LogType;
+use App\Module\Fund\Enums\FUND_TYPE;
+use App\Module\Fund\Enums\LOG_TYPE;
 use App\Module\Fund\Models\FundLogModel;
 use App\Module\Fund\Models\FundModel;
 use App\Module\Fund\Services\FundService;
@@ -69,7 +69,7 @@ class User extends CoreService
      * @param $remark
      * @return bool|string
      */
-    public static function handle($user_id, int $fund_id, int $amount, LogType $type, $id, $remark)
+    public static function handle($user_id, int $fund_id, int $amount, LOG_TYPE $type, $id, $remark)
     {
 
         # 读取信息
@@ -171,7 +171,7 @@ class User extends CoreService
         $user_id,
         $fund_id,
         $amount,
-        LogType $type,
+        LOG_TYPE $type,
         $id,
         $remark,
         $create_ip = ''

app/Module/Fund/Services/FundService.php

@@ -4,8 +4,8 @@ namespace App\Module\Fund\Services;
 
 
 use App\Module\Fund\CoreService;
-use App\Module\Fund\Enums\FundType;
-use App\Module\Fund\Enums\LogType;
+use App\Module\Fund\Enums\FUND_TYPE;
+use App\Module\Fund\Enums\LOG_TYPE;
 use App\Module\Fund\Models\FundAdminModel;
 use App\Module\Fund\Models\FundLogModel;
 use App\Module\Fund\Models\FundModel;
@@ -44,7 +44,7 @@ class FundService extends CoreService
      * @param  int  $amount
      * @param  string  $remark
      */
-    public function circulation(FundType $to_fund_id, int $amount, int $re_id, string $re_type, string $remark)
+    public function circulation(FUND_TYPE $to_fund_id, int $amount, int $re_id, string $re_type, string $remark)
     {
         # 确认货币种类一致
         if (!CurrencyService::check($this->fundId, $to_fund_id->valueInt())) {
@@ -63,12 +63,12 @@ class FundService extends CoreService
         }
         # 进行双方的资金修改
         # 先减少自己的
-        $re46 = User::handle($this->userId, $this->fundId, -$amount, LogType::CIRCULATION, $re_id, $remark);
+        $re46 = User::handle($this->userId, $this->fundId, -$amount, LOG_TYPE::CIRCULATION, $re_id, $remark);
         if (is_string($re46)) {
             return $re46;
         }
         # 再增加自己另一个账户
-        $re51 = User::handle($this->userId, $to_fund_id->valueInt(), $amount, LogType::CIRCULATION, $re_id, $remark);
+        $re51 = User::handle($this->userId, $to_fund_id->valueInt(), $amount, LOG_TYPE::CIRCULATION, $re_id, $remark);
 
 
         if (is_string($re51)) {
@@ -111,7 +111,7 @@ class FundService extends CoreService
         }
         # 进行双方的资金修改
         # 先减少自己的
-        $re46 = User::handle($this->userId, $this->fundId, -$amount, LogType::TRANSFER, $transfer_id, $remark);
+        $re46 = User::handle($this->userId, $this->fundId, -$amount, LOG_TYPE::TRANSFER, $transfer_id, $remark);
         if (is_string($re46)) {
 
             DB::rollBack();
@@ -120,7 +120,7 @@ class FundService extends CoreService
             return $re46;
         }
         # 再增加别人的
-        $re51 = User::handle($toUserId, $this->fundId, $amount, LogType::TRANSFER, $transfer_id, $remark);
+        $re51 = User::handle($toUserId, $this->fundId, $amount, LOG_TYPE::TRANSFER, $transfer_id, $remark);
         if (is_string($re51)) {
 
             DB::rollBack();
@@ -150,7 +150,7 @@ class FundService extends CoreService
         Helper::check_tr();
         $transfer_id = $transfer_type.'-'.$transfer_id;
         # 先减少自己的
-        $re46 = User::handle($this->userId, $this->fundId, -$amount, LogType::TRADE, $transfer_id, $remark);
+        $re46 = User::handle($this->userId, $this->fundId, -$amount, LOG_TYPE::TRADE, $transfer_id, $remark);
 
         if (is_string($re46)) {
             \UCore\Trace::addData('error', $re46);
@@ -158,7 +158,7 @@ class FundService extends CoreService
             return $re46;
         }
         # 再增加别人的
-        $re51 = User::handle($toUserId, $this->fundId, $amount, LogType::TRANSFER, $transfer_id, $remark);
+        $re51 = User::handle($toUserId, $this->fundId, $amount, LOG_TYPE::TRANSFER, $transfer_id, $remark);
         if (is_string($re51)) {
             \UCore\Trace::addData('error', $re51);
 
@@ -173,12 +173,12 @@ class FundService extends CoreService
      * Admin 资金操作
      *
      * @param  int  $admin_id
-     * @param  FundType  $fund_id
+     * @param  FUND_TYPE  $fund_id
      * @param  int  $fund_fee
      * @param $remark
      * @return bool|string
      */
-    public function admin_operate(int $admin_id, FundType $fund_id, int $fund_fee, $remark)
+    public function admin_operate(int $admin_id, FUND_TYPE $fund_id, int $fund_fee, $remark)
     {
 
         $data = [
@@ -203,7 +203,7 @@ class FundService extends CoreService
         }
         # 进行资金操作
         $re = \App\Module\Fund\Service\User::handle($this->userId, $fund_id->value, $fund_fee,
-            \App\Module\Fund\Enums\LogType::ADMIN, $fund_admin->id, $remark);
+            \App\Module\Fund\Enums\LOG_TYPE::ADMIN, $fund_admin->id, $remark);
         if (is_string($re)) {
             DB::rollBack();
 

app/Module/Fund/Tests/Unit/TcTest.php

@@ -3,7 +3,7 @@
 namespace App\Module\Fund\Tests\Unit;
 
 use App\Module\Fund\Dto\TransferDto;
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Services\AccountService;
 use App\Module\Fund\Services\DtoService;
 use App\Module\Fund\Services\FundService;
@@ -28,9 +28,9 @@ class TcTest extends TestCase
 
 
         // 确保测试账户有足够余额
-        $fund = new FundService($this->fromUserId, FundType::BNB->value);
+        $fund = new FundService($this->fromUserId, FUND_TYPE::BNB->value);
         if ($fund->balance() < 10000000) {
-            $fund->admin_operate(1, FundType::BNB, 1000000000, 'TEST');
+            $fund->admin_operate(1, FUND_TYPE::BNB, 1000000000, 'TEST');
         }
     }
 
@@ -41,7 +41,7 @@ class TcTest extends TestCase
     {
         DB::beginTransaction();
         $fund = new FundService($this->fromUserId, 401);
-        $res  = $fund->circulation(FundType::BNB, 10000000, 1, 'TEST', 'TEST');
+        $res  = $fund->circulation(FUND_TYPE::BNB, 10000000, 1, 'TEST', 'TEST');
         self::assertTrue($res);
         DB::commit();
     }

app/Module/Fund/Tests/Unit/TradeTest.php

@@ -3,7 +3,7 @@
 namespace App\Module\Fund\Tests\Unit;
 
 use App\Module\Fund\Dto\TransferDto;
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Services\AccountService;
 use App\Module\Fund\Services\DtoService;
 use App\Module\Fund\Services\FundService;
@@ -29,7 +29,7 @@ class TradeTest extends TestCase
         // 确保测试账户有足够余额
         $fund = new FundService($this->fromUserId, 1);
         if($fund->balance() < 10000){
-            $fund->admin_operate(1, FundType::FUND1, 10000, 'TEST');
+            $fund->admin_operate(1, FUND_TYPE::FUND1, 10000, 'TEST');
         }
     }
 

app/Module/Fund/Tests/Unit/TtrTest.php

@@ -3,7 +3,7 @@
 namespace App\Module\Fund\Tests\Unit;
 
 use App\Module\Fund\Dto\TransferDto;
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Services\AccountService;
 use App\Module\Fund\Services\DtoService;
 use App\Module\Fund\Services\FundService;
@@ -28,7 +28,7 @@ class TtrTest extends TestCase
         // 确保测试账户有足够余额
         $fund = new FundService($this->fromUserId, 1);
         if($fund->balance() < 10000){
-            $fund->admin_operate(1, FundType::FUND1, 10000, 'TEST');
+            $fund->admin_operate(1, FUND_TYPE::FUND1, 10000, 'TEST');
         }
     }
 

app/Module/Fund/Validators/CheckUserFund.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Fund\Validators;
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Services\FundService;
 use UCore\Validator;
 
@@ -17,9 +17,9 @@ class CheckUserFund extends Validator
     public function validate(mixed $value, array $data): bool
     {
         $map = [
-            1 => FundType::FUND1->value,
-            2 => FundType::USD->value,
-            3 => FundType::BNB->value
+            1 => FUND_TYPE::FUND1->value,
+            2 => FUND_TYPE::USD->value,
+            3 => FUND_TYPE::BNB->value
         ];
 
         $fundId = $map[$data['coinType']];

app/Module/Fund/Validators/FundIdCheck.php

@@ -3,7 +3,7 @@
 namespace App\Module\Fund\Validators;
 
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use UCore\Validator;
 
 /**
@@ -15,7 +15,7 @@ class FundIdCheck extends Validator
 
     public function validate(mixed $value, array $data): bool
     {
-        $ks = FundType::toArray();
+        $ks = FUND_TYPE::toArray();
         if (in_array($value, array_values($ks))) {
             return true;
         }

app/Module/Mail/Hooks/MailNotificationHook.php

@@ -3,7 +3,7 @@
 namespace App\Module\Mail\Hooks;
 
 use App\Module\Notification\Contracts\NotificationHookInterface;
-use App\Module\Notification\Enums\NotificationChannel;
+use App\Module\Notification\Enums\NOTIFICATION_CHANNEL;
 use App\Module\Mail\Services\MailService;
 use Illuminate\Support\Facades\Log;
 
@@ -25,7 +25,7 @@ class MailNotificationHook implements NotificationHookInterface
     public function beforeSend(array $data): array
     {
         // 检查是否包含邮件渠道
-        if (!in_array(NotificationChannel::MAIL, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::MAIL, $data['channels'])) {
             return $data;
         }
 
@@ -34,7 +34,7 @@ class MailNotificationHook implements NotificationHookInterface
             Log::warning('用户邮箱为空，跳过邮件发送', [
                 'user_id' => $data['user_id']
             ]);
-            $data['channels'] = array_diff($data['channels'], [NotificationChannel::MAIL]);
+            $data['channels'] = array_diff($data['channels'], [NOTIFICATION_CHANNEL::MAIL]);
             return $data;
         }
 
@@ -43,7 +43,7 @@ class MailNotificationHook implements NotificationHookInterface
             Log::warning('邮件模板ID为空，跳过邮件发送', [
                 'template_id' => $data['template_id']
             ]);
-            $data['channels'] = array_diff($data['channels'], [NotificationChannel::MAIL]);
+            $data['channels'] = array_diff($data['channels'], [NOTIFICATION_CHANNEL::MAIL]);
             return $data;
         }
 
@@ -59,7 +59,7 @@ class MailNotificationHook implements NotificationHookInterface
      */
     public function afterSend(array $data, bool $result): void
     {
-        if (!in_array(NotificationChannel::MAIL, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::MAIL, $data['channels'])) {
             return;
         }
 
@@ -78,7 +78,7 @@ class MailNotificationHook implements NotificationHookInterface
      */
     public function onError(array $data, \Exception $exception): void
     {
-        if (!in_array(NotificationChannel::MAIL, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::MAIL, $data['channels'])) {
             return;
         }
 

app/Module/Notification/Enums/NotificationChannel.php → app/Module/Notification/Enums/NOTIFICATION_CHANNEL.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Notification\Enums;
 
-enum NotificationChannel: string
+enum NOTIFICATION_CHANNEL: string
 {
     case SMS = 'sms';
     case MAIL = 'mail';

app/Module/Notification/Enums/NotificationStatus.php → app/Module/Notification/Enums/NOTIFICATION_STATUS.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Notification\Enums;
 
-enum NotificationStatus: string
+enum NOTIFICATION_STATUS: string
 {
     case PENDING = 'pending';
     case SENDING = 'sending';

app/Module/Notification/Services/NotificationService.php

@@ -3,8 +3,8 @@
 namespace App\Module\Notification\Services;
 
 use App\Module\Notification\Contracts\NotificationHookInterface;
-use App\Module\Notification\Enums\NotificationChannel;
-use App\Module\Notification\Enums\NotificationStatus;
+use App\Module\Notification\Enums\NOTIFICATION_CHANNEL;
+use App\Module\Notification\Enums\NOTIFICATION_STATUS;
 use App\Module\Notification\Models\NotificationTemplate;
 use App\Module\Notification\Models\NotificationLog;
 use App\Module\Notification\Queues\SendNotificationQueue;
@@ -176,7 +176,7 @@ class NotificationService
         }
 
         foreach ($data['channels'] as $channel) {
-            if (!in_array($channel, NotificationChannel::values())) {
+            if (!in_array($channel, NOTIFICATION_CHANNEL::values())) {
                 throw new \Exception('无效的通知渠道');
             }
         }
@@ -215,7 +215,7 @@ class NotificationService
             'title' => $template->title,
             'content' => $template->content,
             'data' => $data['data'] ?? [],
-            'status' => NotificationStatus::PENDING
+            'status' => NOTIFICATION_STATUS::PENDING
         ]);
     }
 
@@ -228,7 +228,7 @@ class NotificationService
     public function handleNotification(NotificationLog $notification): void
     {
         try {
-            $notification->update(['status' => NotificationStatus::SENDING]);
+            $notification->update(['status' => NOTIFICATION_STATUS::SENDING]);
 
             // 获取用户信息
             $data = [
@@ -246,7 +246,7 @@ class NotificationService
             }
 
             $notification->update([
-                'status' => NotificationStatus::SENT,
+                'status' => NOTIFICATION_STATUS::SENT,
                 'sent_at' => now()
             ]);
 
@@ -254,7 +254,7 @@ class NotificationService
             $this->hookManager->executeAfterSend($data, true);
         } catch (\Exception $e) {
             $notification->update([
-                'status' => NotificationStatus::FAILED,
+                'status' => NOTIFICATION_STATUS::FAILED,
                 'message' => $e->getMessage()
             ]);
 

app/Module/Push/Hooks/PushNotificationHook.php

@@ -3,7 +3,7 @@
 namespace App\Module\Push\Hooks;
 
 use App\Module\Notification\Contracts\NotificationHookInterface;
-use App\Module\Notification\Enums\NotificationChannel;
+use App\Module\Notification\Enums\NOTIFICATION_CHANNEL;
 use App\Module\Push\Services\PushService;
 use Illuminate\Support\Facades\Log;
 
@@ -25,7 +25,7 @@ class PushNotificationHook implements NotificationHookInterface
     public function beforeSend(array $data): array
     {
         // 检查是否包含推送渠道
-        if (!in_array(NotificationChannel::PUSH, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::PUSH, $data['channels'])) {
             return $data;
         }
 
@@ -34,7 +34,7 @@ class PushNotificationHook implements NotificationHookInterface
             Log::warning('用户设备令牌为空，跳过推送发送', [
                 'user_id' => $data['user_id']
             ]);
-            $data['channels'] = array_diff($data['channels'], [NotificationChannel::PUSH]);
+            $data['channels'] = array_diff($data['channels'], [NOTIFICATION_CHANNEL::PUSH]);
             return $data;
         }
 
@@ -43,7 +43,7 @@ class PushNotificationHook implements NotificationHookInterface
             Log::warning('推送模板ID为空，跳过推送发送', [
                 'template_id' => $data['template_id']
             ]);
-            $data['channels'] = array_diff($data['channels'], [NotificationChannel::PUSH]);
+            $data['channels'] = array_diff($data['channels'], [NOTIFICATION_CHANNEL::PUSH]);
             return $data;
         }
 
@@ -59,7 +59,7 @@ class PushNotificationHook implements NotificationHookInterface
      */
     public function afterSend(array $data, bool $result): void
     {
-        if (!in_array(NotificationChannel::PUSH, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::PUSH, $data['channels'])) {
             return;
         }
 
@@ -78,7 +78,7 @@ class PushNotificationHook implements NotificationHookInterface
      */
     public function onError(array $data, \Exception $exception): void
     {
-        if (!in_array(NotificationChannel::PUSH, $data['channels'])) {
+        if (!in_array(NOTIFICATION_CHANNEL::PUSH, $data['channels'])) {
             return;
         }
 

app/Module/System/Admin/Actions/ConfigEmbedsEditAction.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 use UCore\DcatAdmin\RowAction;
 
 /**
@@ -23,7 +23,7 @@ class ConfigEmbedsEditAction extends RowAction
 
     public function allowed()
     {
-        return $this->getRow()->type == ConfigType::TYPE_EMBEDS->value();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_EMBEDS->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigFloatEditAction.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * 浮点数字修改数值 动作
@@ -21,7 +21,7 @@ class ConfigFloatEditAction extends \UCore\DcatAdmin\RowAction
 
     public function allowed()
     {
-        return $this->getRow()->type == ConfigType::TYPE_FLOAT->value();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_FLOAT->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigImgEditAction.php

@@ -21,7 +21,7 @@ class ConfigImgEditAction extends \UCore\DcatAdmin\RowAction
     public function allowed()
     {
 
-        return $this->getRow()->type == \App\Module\System\Enums\ConfigType::TYPE_IMG->value();
+        return $this->getRow()->type == \App\Module\System\Enums\CONFIG_TYPE::TYPE_IMG->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigIntEditAction.php

@@ -5,7 +5,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * 数字 动作
@@ -25,7 +25,7 @@ class ConfigIntEditAction extends \UCore\DcatAdmin\RowAction
 
     public function allowed()
     {
-        return $this->getRow()->type == ConfigType::TYPE_INT->valueInt();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_INT->valueInt();
     }
 
 

app/Module/System/Admin/Actions/ConfigJsonEditAction.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * json键值对 动作
@@ -23,7 +23,7 @@ class ConfigJsonEditAction extends \UCore\DcatAdmin\RowAction
 
     public function allowed()
     {
-        return $this->getRow()->type == ConfigType::TYPE_JSON->value();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_JSON->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigStringEditAction.php

@@ -5,7 +5,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * 字符串 动作
@@ -25,7 +25,7 @@ class ConfigStringEditAction extends \UCore\DcatAdmin\RowAction
     public function allowed()
     {
 //        dump($this->getRow()->type);
-        return $this->getRow()->type == ConfigType::TYPE_STRING->value();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_STRING->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigSwitchEditAction.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * bool修改 动作
@@ -18,7 +18,7 @@ class ConfigSwitchEditAction extends \UCore\DcatAdmin\RowAction
     public function allowed()
     {
 
-        return $this->getRow()->type == ConfigType::TYPE_BOOL->value();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_BOOL->value();
     }
 
 

app/Module/System/Admin/Actions/ConfigTimeEditAction.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Admin\Actions;
 
 
 
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 
 /**
  * 时间,秒 动作
@@ -18,7 +18,7 @@ class ConfigTimeEditAction extends \UCore\DcatAdmin\RowAction
 
     public function allowed()
     {
-        return $this->getRow()->type == ConfigType::TYPE_TIME->valueInt();
+        return $this->getRow()->type == CONFIG_TYPE::TYPE_TIME->valueInt();
     }
 
 

app/Module/System/AdminControllers/AdminGridViewController.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\System\AdminControllers;
 
-use App\Module\System\Enums\ViewType;
+use App\Module\System\Enums\VIEW_TYPE;
 use App\Module\System\Models\AdminGridView;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
@@ -79,7 +79,7 @@ class AdminGridViewController extends AdminController
                 ->placeholder("不要修改这个!");
 
             $form->text('title', '标题')->required();
-            $form->radio('type1', '类型')->options(ViewType::getValueDescription());
+            $form->radio('type1', '类型')->options(VIEW_TYPE::getValueDescription());
             $form->saving(function (Form $form) {
                 // 删除
                 $form->deleteInput('p1');
@@ -119,7 +119,7 @@ class AdminGridViewController extends AdminController
 
             $model              = new AdminGridView();
             $model->admin_id    = Admin::user()->getKey();
-            $model->type1       = ViewType::PUBLIC;
+            $model->type1       = VIEW_TYPE::PUBLIC;
             $model->router_name = $router_name;
             $model->title       = '自定义视图';
             admin_success('视图创建成功') ;

app/Module/System/AdminControllers/ConfigAController.php

@@ -12,7 +12,7 @@ use App\Module\System\Admin\Actions\ConfigStringEditAction;
 use App\Module\System\Admin\Actions\ConfigSwitchEditAction;
 use App\Module\System\Admin\Actions\ConfigTimeEditAction;
 use App\Module\System\Admin\Actions\ToConfig;
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 use App\Module\System\Repositories\AppConfig;
 use App\Module\System\Services\ConfigService;
 use Dcat\Admin\Form;
@@ -58,7 +58,7 @@ class ConfigAController extends \Dcat\Admin\Http\Controllers\AdminController
 //            $grid->column('desc','描述');
 
 
-            $grid->column('type')->using(ConfigType::getValueDescription());
+            $grid->column('type')->using(CONFIG_TYPE::getValueDescription());
             $grid->column('value');
             $helper->columnView('value','admin_core.config.value','当前值');
 

app/Module/System/Enums/ConfigType.php → app/Module/System/Enums/CONFIG_TYPE.php

@@ -10,7 +10,7 @@ use UCore\Enum\EnumToInt;
  * 配置类型
  *
  */
-enum ConfigType: int
+enum CONFIG_TYPE: int
 {
     use EnumToInt,EnumCore;
 

app/Module/System/Enums/ViewType.php → app/Module/System/Enums/VIEW_TYPE.php

@@ -9,7 +9,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToString;
 
-enum ViewType: string
+enum VIEW_TYPE: string
 {
 
     use EnumExpression, EnumToString,EnumCore;

app/Module/System/Models/AdminGridView.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Models;
 
 
 use App\Models\ModelCore;
-use App\Module\System\Enums\ViewType;
+use App\Module\System\Enums\VIEW_TYPE;
 
 
 /**
@@ -12,10 +12,10 @@ use App\Module\System\Enums\ViewType;
  *
  * Class AdminActionlog
  *
- * field start 
- * @property   int  $id  
+ * field start
+ * @property   int  $id
  * @property   int  $admin_id  操作的Admin ID
- * @property   string  $type1  
+ * @property   string  $type1
  * @property   string  $title  视图标题
  * @property   string  $router_name  路由名字
  * @property   string  $p1  参数1
@@ -26,7 +26,7 @@ use App\Module\System\Enums\ViewType;
  */
 class AdminGridView extends ModelCore
 {
-    // attrlist start 
+    // attrlist start
     protected $fillable = [
         'id',
         'admin_id',
@@ -39,7 +39,7 @@ class AdminGridView extends ModelCore
 
     protected $casts = [
         'p1'    => 'array',
-        'type1' => ViewType::class
+        'type1' => VIEW_TYPE::class
     ];
 
     public function admin()

app/Module/System/Services/ConfigService.php

@@ -4,7 +4,7 @@ namespace App\Module\System\Services;
 
 
 use App\Module\File\Img;
-use App\Module\System\Enums\ConfigType;
+use App\Module\System\Enums\CONFIG_TYPE;
 use App\Module\System\Models\SysConfig;
 use UCore\Helper\Cache;
 use UCore\Helper\CacheTag;
@@ -100,28 +100,28 @@ class ConfigService
 
         if ($model) {
 //            dump($model);
-            if ($model->type === ConfigType::TYPE_INT->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_INT->valueInt()) {
                 return (int)$model->value;
             }
-            if ($model->type === ConfigType::TYPE_FLOAT->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_FLOAT->valueInt()) {
                 return (float)$model->value;
             }
-            if ($model->type === ConfigType::TYPE_TIME->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_TIME->valueInt()) {
                 return (int)$model->value;
             }
-            if ($model->type === ConfigType::TYPE_IMG->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_IMG->valueInt()) {
                 return Img::getAdminPicUrl($model->value);
             }
-            if ($model->type === ConfigType::TYPE_BOOL->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_BOOL->valueInt()) {
                 return boolval($model->value);
             }
-            if ($model->type === ConfigType::TYPE_IS->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_IS->valueInt()) {
                 return boolval($model->value);
             }
-            if ($model->type === ConfigType::TYPE_JSON->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_JSON->valueInt()) {
                 return json_decode($model->value,true);
             }
-            if ($model->type === ConfigType::TYPE_EMBEDS->valueInt()) {
+            if ($model->type === CONFIG_TYPE::TYPE_EMBEDS->valueInt()) {
                 return json_decode($model->value,true);
             }
 

app/Module/Test/Enums/TestType.php → app/Module/Test/Enums/TEST_TYPE.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Test\Enums;
 
-enum TestType: int
+enum TEST_TYPE: int
 {
     /**
      * 禁用

app/Module/Transaction/Services/TransactionService.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Transaction\Services;
 
-use App\Module\Fund\Enums\FundType;
+use App\Module\Fund\Enums\FUND_TYPE;
 use App\Module\Fund\Services\FundService;
 use App\Module\System\Models\ReceiveAddress;
 use App\Module\System\Services\OrderNo;
@@ -169,21 +169,21 @@ class TransactionService
             $minerUserId = 0;
             // uraus转赠
             if ($coinType == ACCOUNT_TYPE::URAUS->value) {
-                $fund = new FundService($userId, FundType::FUND1->value);
-                $toUserId = FundType::FUND2;
-                $minerUserId = FundType::FUND2;
+                $fund = new FundService($userId, FUND_TYPE::FUND1->value);
+                $toUserId = FUND_TYPE::FUND2;
+                $minerUserId = FUND_TYPE::FUND2;
             }
             // usdt转赠
             if ($coinType == ACCOUNT_TYPE::USDT->value) {
-                $fund = new FundService($userId, FundType::USD->value);
-                $toUserId = FundType::USD2;
-                $minerUserId = FundType::USD2;
+                $fund = new FundService($userId, FUND_TYPE::USD->value);
+                $toUserId = FUND_TYPE::USD2;
+                $minerUserId = FUND_TYPE::USD2;
             }
             // bnb转赠
             if ($coinType == ACCOUNT_TYPE::BNB->value) {
-                $fund = new FundService($userId, FundType::BNB->value);
-                $toUserId = FundType::BBB2;
-                $minerUserId = FundType::USD2;
+                $fund = new FundService($userId, FUND_TYPE::BNB->value);
+                $toUserId = FUND_TYPE::BBB2;
+                $minerUserId = FUND_TYPE::USD2;
             }
             $fund->circulation($toUserId, $amount, $transactionId, 'TRANSFER', 'TRANSFER');
             // 矿工费
@@ -240,22 +240,22 @@ class TransactionService
             $minerUserId = 0;
             // uraus提现
             if ($coinType == ACCOUNT_TYPE::URAUS->value) {
-                $fund = new FundService($userId, FundType::FUND1->value);
-                $toUserId = FundType::FUND2;
-                $minerUserId = FundType::FUND2;
+                $fund = new FundService($userId, FUND_TYPE::FUND1->value);
+                $toUserId = FUND_TYPE::FUND2;
+                $minerUserId = FUND_TYPE::FUND2;
             }
             // usdt提现
             if ($coinType == ACCOUNT_TYPE::USDT->value) {
-                $fund = new FundService($userId, FundType::USD->value);
-                $toUserId = FundType::USD2;
-                $minerUserId = FundType::USD2;
+                $fund = new FundService($userId, FUND_TYPE::USD->value);
+                $toUserId = FUND_TYPE::USD2;
+                $minerUserId = FUND_TYPE::USD2;
             }
             // bnb提现
             if ($coinType == ACCOUNT_TYPE::BNB->value) {
-                $fund = new FundService($userId, FundType::BNB->value);
-                $minerFund = new FundService($userId, FundType::USD->value);
-                $toUserId = FundType::BBB2;
-                $minerUserId = FundType::USD2;
+                $fund = new FundService($userId, FUND_TYPE::BNB->value);
+                $minerFund = new FundService($userId, FUND_TYPE::USD->value);
+                $toUserId = FUND_TYPE::BBB2;
+                $minerUserId = FUND_TYPE::USD2;
             }
             $fund->circulation($toUserId, $amount, $transactionId, 'WITHDRAWAL', 'WITHDRAWAL');
             // 矿工费

app/Module/Ulogic/Enum/AppMessageStatus.php → app/Module/Ulogic/Enum/APP_MESSAGE_STATUS.php

@@ -5,7 +5,7 @@ namespace App\Module\AppMessage\Enums;
 /**
  * 应用消息状态枚举
  */
-enum AppMessageStatus: string
+enum APP_MESSAGE_STATUS: string
 {
     /**
      * 草稿状态

app/Module/Ulogic/Enum/AppMessageType.php → app/Module/Ulogic/Enum/APP_MESSAGE_TYPE.php

@@ -5,7 +5,7 @@ namespace App\Module\AppMessage\Enums;
 /**
  * 应用消息类型枚举
  */
-enum AppMessageType: string
+enum APP_MESSAGE_TYPE: string
 {
     /**
      * 系统消息

app/Module/Ulogic/Enum/AppSenderType.php → app/Module/Ulogic/Enum/APP_SENDER_TYPE.php

@@ -5,7 +5,7 @@ namespace App\Module\AppMessage\Enums;
 /**
  * 应用消息发送者类型枚举
  */
-enum AppSenderType: string
+enum APP_SENDER_TYPE: string
 {
     /**
      * 系统发送

app/Module/Ulogic/Enum/InternalType.php → app/Module/Ulogic/Enum/INTERNAL_TYPE.php

@@ -6,7 +6,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToInt;
 
-enum InternalType: int
+enum INTERNAL_TYPE: int
 {
 
     use EnumToInt, EnumCore, EnumExpression;

app/Module/Ulogic/Enum/PunishGroup.php → app/Module/Ulogic/Enum/PUNISH_GROUP.php

@@ -10,7 +10,7 @@ use UCore\Enum\EnumName;
  * 违规分组
  *
  */
-enum  PunishGroup
+enum  PUNISH_GROUP
 {
     use EnumName,EnumCore;
     /**

app/Module/Ulogic/Enum/PunishType.php → app/Module/Ulogic/Enum/PUNISH_TYPE.php

@@ -11,7 +11,7 @@ use UCore\Enum\EnumName;
  * 惩罚类型
  *
  */
-enum  PunishType
+enum  PUNISH_TYPE
 {
     use EnumName,EnumCore,EnumExpression;
 

app/Module/Ulogic/Enum/Rule.php → app/Module/Ulogic/Enum/RULE.php

@@ -6,7 +6,7 @@ namespace App\Module\Ulogic\Enum;
 use UCore\Enum\EnumCore;
 use UCore\Enum\EnumToInt;
 
-enum Rule: int
+enum RULE: int
 {
 
     use EnumToInt,EnumCore;

app/Module/Ulogic/Enum/UserAddressType.php → app/Module/Ulogic/Enum/USER_ADDRESS_TYPE.php

@@ -6,7 +6,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToInt;
 
-enum UserAddressType: int
+enum USER_ADDRESS_TYPE: int
 {
 
     use EnumToInt, EnumCore, EnumExpression;

app/Module/Ulogic/Enum/WalletAddressStatus.php → app/Module/Ulogic/Enum/WALLET_ADDRESS_STATUS.php

@@ -6,7 +6,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToInt;
 
-enum WalletAddressStatus: int
+enum WALLET_ADDRESS_STATUS: int
 {
 
     use EnumToInt, EnumCore, EnumExpression;

app/Module/Ulogic/Enum/WalletAddressType.php → app/Module/Ulogic/Enum/WALLET_ADDRESS_TYPE.php

@@ -6,7 +6,7 @@ use UCore\Enum\EnumCore;
 use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumToInt;
 
-enum WalletAddressType: int
+enum WALLET_ADDRESS_TYPE: int
 {
 
     use EnumToInt, EnumCore, EnumExpression;

app/Module/Ulogic/Internal.php

@@ -3,7 +3,7 @@
 namespace App\Module\Ulogic;
 
 
-use App\Module\Ulogic\Enum\InternalType;
+use App\Module\Ulogic\Enum\INTERNAL_TYPE;
 
 /**
  * 站内信
@@ -58,13 +58,13 @@ class Internal
         $model->cate    = $cate;
         $model->from_id = $user_id;
         if($user_id){
-            $model->type1= InternalType::USER;
+            $model->type1= INTERNAL_TYPE::USER;
         }
         if(!$user_id){
             if($admin_id){
-                $model->type1= InternalType::ADMIN;
+                $model->type1= INTERNAL_TYPE::ADMIN;
             }else{
-                $model->type1= InternalType::SYSTEM;
+                $model->type1= INTERNAL_TYPE::SYSTEM;
             }
         }
         $model->admin_id = $admin_id;

app/Module/Ulogic/Model/AppMessage.php

@@ -2,15 +2,15 @@
 
 namespace App\Module\AppMessage\Models;
 
-use App\Module\AppMessage\Enums\AppMessageStatus;
-use App\Module\AppMessage\Enums\AppMessageType;
-use App\Module\AppMessage\Enums\AppSenderType;
+use App\Module\AppMessage\Enums\APP_MESSAGE_STATUS;
+use App\Module\AppMessage\Enums\APP_MESSAGE_TYPE;
+use App\Module\AppMessage\Enums\APP_SENDER_TYPE;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
  * 应用消息模型
- * field start 
+ * field start
  * field end
  *
  * @property-read \Illuminate\Database\Eloquent\Collection|AppMessageRecipient[] $recipients 消息接收者列表
@@ -46,9 +46,9 @@ class AppMessage extends Model
      */
     protected $casts = [
         'data' => 'array',
-        'status' => AppMessageStatus::class,
-        'type' => AppMessageType::class,
-        'sender_type' => AppSenderType::class
+        'status' => APP_MESSAGE_STATUS::class,
+        'type' => APP_MESSAGE_TYPE::class,
+        'sender_type' => APP_SENDER_TYPE::class
     ];
 
     /**

app/Module/Ulogic/Model/AppMessageTemplate.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\AppMessage\Models;
 
-use App\Module\AppMessage\Enums\AppMessageType;
+use App\Module\AppMessage\Enums\APP_MESSAGE_TYPE;
 use Illuminate\Database\Eloquent\Model;
 
 /**
@@ -50,7 +50,7 @@ class AppMessageTemplate extends Model
      */
     protected $casts = [
         'variables' => 'array',
-        'type' => AppMessageType::class,
+        'type' => APP_MESSAGE_TYPE::class,
         'status' => 'boolean'
     ];
 

app/Module/Ulogic/Model/Internal.php

@@ -3,7 +3,7 @@
 namespace App\Module\Ulogic\Model;
 
 use App\Models\ModelCore;
-use App\Module\Ulogic\Enum\InternalType;
+use App\Module\Ulogic\Enum\INTERNAL_TYPE;
 use App\Module\User\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
@@ -34,7 +34,7 @@ class Internal extends ModelCore
     use SoftDeletes;
 
     protected $casts = [
-        'type1' => InternalType::class
+        'type1' => INTERNAL_TYPE::class
     ];
 
     // attrlist start

app/Module/Ulogic/Model/UserPunish.php

@@ -3,22 +3,22 @@
 namespace App\Module\Ulogic\Model;
 
 use App\Models\ModelCore;
-use App\Module\Ulogic\Enum\PunishType;
+use App\Module\Ulogic\Enum\PUNISH_TYPE;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 /**
  * 用户 惩罚（违规记录）
  * punish
  *
- * field start 
- * @property   int  $id  
+ * field start
+ * @property   int  $id
  * @property   int  $user_id  用户ID
  * @property   string  $type  类型
- * @property   \Carbon\Carbon  $created_at  
- * @property   \Carbon\Carbon  $updated_at  
+ * @property   \Carbon\Carbon  $created_at
+ * @property   \Carbon\Carbon  $updated_at
  * @property   string  $desc  描述
  * @property   int  $level  惩罚等级
- * @property   \Carbon\Carbon  $deleted_at  
+ * @property   \Carbon\Carbon  $deleted_at
  * @property   int  $admin_id  做出惩罚的管理员ID
  * field end
  *
@@ -32,7 +32,7 @@ class UserPunish extends ModelCore
     protected $table = 'user_punishs';
 
     protected $casts = [
-        'type' => PunishType::class
+        'type' => PUNISH_TYPE::class
     ];
 
     public function user(): HasOne

app/Module/Ulogic/Model/WalletAddress.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\Ulogic\Model;
 
-use App\Module\Ulogic\Enum\WalletAddressStatus;
-use App\Module\Ulogic\Enum\WalletAddressType;
+use App\Module\Ulogic\Enum\WALLET_ADDRESS_STATUS;
+use App\Module\Ulogic\Enum\WALLET_ADDRESS_TYPE;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;

app/Module/Ulogic/Punish.php

@@ -3,7 +3,7 @@
 namespace App\Module\Ulogic;
 
 use App\Module\App\SessionApp;
-use App\Module\Ulogic\Enum\PunishType;
+use App\Module\Ulogic\Enum\PUNISH_TYPE;
 use App\Module\Ulogic\logic\PunishGroup;
 use App\Module\Ulogic\logic\PunishLevel;
 use App\Module\Ulogic\Model\UserPunish;
@@ -24,12 +24,12 @@ class Punish
      * 增加一个违规记录
      * @param $admin_id
      * @param $user_id
-     * @param PunishType $type
+     * @param PUNISH_TYPE $type
      * @param $desc
      * @param $level
      * @return UserPunish
      */
-    static public function push($admin_id, $user_id, PunishType $type, $desc)
+    static public function push($admin_id, $user_id, PUNISH_TYPE $type, $desc)
 
     {
         $level = PunishLevel::levelMatch($type);
@@ -50,7 +50,7 @@ class Punish
      * @param $user_id
      * @return void
      */
-    static public function call_user($user_id, PunishType $type,$admin_id,$desc)
+    static public function call_user($user_id, PUNISH_TYPE $type,$admin_id,$desc)
     {
 
         list($group, $win) = PunishGroup::groupMatch($type);
@@ -63,10 +63,10 @@ class Punish
             ->where('level', '=', $level)
             ->count();
         switch ($group) {
-            case \App\Module\Ulogic\Enum\PunishGroup::Group1->value():
+            case \App\Module\Ulogic\Enum\PUNISH_GROUP::Group1->value():
                 self::call_user1($user_id, $groupCount,$levelCount,$admin_id,$desc);
                 break;
-            case \App\Module\Ulogic\Enum\PunishGroup::Group2->value():
+            case \App\Module\Ulogic\Enum\PUNISH_GROUP::Group2->value():
                 //直接封号
                 self::call_user2($user_id, $groupCount,$levelCount,$admin_id,$desc);
                 break;

app/Module/Ulogic/Services/AppMessageService.php

@@ -2,9 +2,9 @@
 
 namespace App\Module\Ulogic\Services;
 
-use App\Module\AppMessage\Enums\AppMessageStatus;
-use App\Module\AppMessage\Enums\AppMessageType;
-use App\Module\AppMessage\Enums\AppSenderType;
+use App\Module\AppMessage\Enums\APP_MESSAGE_STATUS;
+use App\Module\AppMessage\Enums\APP_MESSAGE_TYPE;
+use App\Module\AppMessage\Enums\APP_SENDER_TYPE;
 use App\Module\AppMessage\Models\AppMessage;
 use App\Module\AppMessage\Models\AppMessageRecipient;
 use App\Module\AppMessage\Models\AppMessageTemplate;

app/Module/Ulogic/logic/PunishGroup.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\logic;
 
-use App\Module\Ulogic\Enum\PunishType;
+use App\Module\Ulogic\Enum\PUNISH_TYPE;
 
 /**
  *
@@ -22,17 +22,17 @@ class PunishGroup
     static public function getGroup(): array
     {
         if (!self::$GROUP) {
-            self::$GROUP[\App\Module\Ulogic\Enum\PunishGroup::Group1->value()] = [
-                PunishType::OrderNoPay->value(),
-                PunishType::OrderComplaint->value()
+            self::$GROUP[\App\Module\Ulogic\Enum\PUNISH_GROUP::Group1->value()] = [
+                PUNISH_TYPE::OrderNoPay->value(),
+                PUNISH_TYPE::OrderComplaint->value()
             ];
-            self::$GROUP[\App\Module\Ulogic\Enum\PunishGroup::Group2->value()] = [
-                PunishType::OrderRealInconsistent->value(),
-                PunishType::OrderPayCheat->value()
+            self::$GROUP[\App\Module\Ulogic\Enum\PUNISH_GROUP::Group2->value()] = [
+                PUNISH_TYPE::OrderRealInconsistent->value(),
+                PUNISH_TYPE::OrderPayCheat->value()
             ];
 
-            self::$GROUP[\App\Module\Ulogic\Enum\PunishGroup::Group99->value()] = [
-                PunishType::Moren->value()
+            self::$GROUP[\App\Module\Ulogic\Enum\PUNISH_GROUP::Group99->value()] = [
+                PUNISH_TYPE::Moren->value()
             ];
         }
 
@@ -41,10 +41,10 @@ class PunishGroup
 
     /**
      * 匹配分组
-     * @param PunishType $punishType
+     * @param PUNISH_TYPE $punishType
      * @return void
      */
-    static public function groupMatch(PunishType $punishType)
+    static public function groupMatch(PUNISH_TYPE $punishType)
     {
         $list = self::getGroup();
         foreach ($list as $group => $l) {

app/Module/Ulogic/logic/PunishLevel.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\Ulogic\logic;
 
-use App\Module\Ulogic\Enum\PunishType;
+use App\Module\Ulogic\Enum\PUNISH_TYPE;
 
 /**
  * 违规等级
@@ -19,11 +19,11 @@ class PunishLevel
     static public function getLevel():array
     {
         if (!self::$level) {
-            self::$level[PunishType::OrderNoPay->value()] = 1;
-            self::$level[PunishType::OrderComplaint->value()] = 1;
+            self::$level[PUNISH_TYPE::OrderNoPay->value()] = 1;
+            self::$level[PUNISH_TYPE::OrderComplaint->value()] = 1;
 
-            self::$level[PunishType::OrderRealInconsistent->value()] = 10;
-            self::$level[PunishType::OrderPayCheat->value()] = 10;
+            self::$level[PUNISH_TYPE::OrderRealInconsistent->value()] = 10;
+            self::$level[PUNISH_TYPE::OrderPayCheat->value()] = 10;
 
         }
         return self::$level;
@@ -32,10 +32,10 @@ class PunishLevel
 
     /**
      * 等级 匹配
-     * @param PunishType $punishType
+     * @param PUNISH_TYPE $punishType
      * @return int|mixed
      */
-    static public function levelMatch(PunishType $punishType)
+    static public function levelMatch(PUNISH_TYPE $punishType)
     {
         $list = self::getLevel();