9

app/Module/Dev/AdminControllers/DevController.php

@@ -196,10 +196,10 @@ class DevController extends Controller
         $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['UserStatus']     = \App\Module\User\Enums\STATUS::getValueDescription();
+        $data['UserStatus2']    = \App\Module\User\Enums\STATUS2::getValueDescription();
         $data['UserPunishType'] = \App\Module\Ulogic\Enum\PUNISH_TYPE::getValueDescription();
-        $data['UserAction']     = \App\Module\User\Enums\ActionType::getValueDescription();
+        $data['UserAction']     = \App\Module\User\Enums\ACTION_TYPE::getValueDescription();
 
         $data['GuidanceStatus'] = GuidanceStatus::getValueDescription();
 

app/Module/User/Action.php

@@ -3,9 +3,9 @@
 namespace App\Module\User;
 
 use App\Module\App\SessionApp;
-use App\Module\User\Enums\ActionStatus;
-use App\Module\User\Enums\ActionType;
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\ACTION_STATUS;
+use App\Module\User\Enums\ACTION_TYPE;
+use App\Module\User\Enums\STATUS2;
 use App\Module\User\Models\UserAction;
 use App\Module\User\Unit\UserPublic;
 use Dcore\Db\Arr;
@@ -33,7 +33,7 @@ class Action
      */
     static public function ban($admin_id, $user_id, $desc, $re_id, $re_type,$exp = 360000)
     {
-        return self::call_type($admin_id, $user_id, $desc, $re_id, $re_type,ActionType::Ban,$exp);
+        return self::call_type($admin_id, $user_id, $desc, $re_id, $re_type,ACTION_TYPE::BAN,$exp);
     }
 
     /**
@@ -44,7 +44,7 @@ class Action
      * @param $re_type
      * @return UserAction
      */
-    static public function call_type($admin_id, $user_id, $desc, $re_id, $re_type,ActionType $type,$exp = 360000)
+    static public function call_type($admin_id, $user_id, $desc, $re_id, $re_type,ACTION_TYPE $type,$exp = 360000)
     {
         Helper::check_tr();
         // 增加封禁记录
@@ -57,20 +57,20 @@ class Action
         $model->type =$type;
         if($exp){
             $model->exp_time = time()+$exp;
-            $model->status = ActionStatus::Ing;
+            $model->status = ACTION_STATUS::ING;
         }else{
             $model->exp_time = 0;
-            $model->status = ActionStatus::Ok;
+            $model->status = ACTION_STATUS::OK;
         }
         if(! $model->save()){
             throw new \LogicException("user - Action save type error. ");
         }
 
         $list = [
-            ActionType::Restrict->value() => Status2::Restrict->value(),
-            ActionType::Normal->value()   => Status2::Normal->value(),
-            ActionType::Delete->value()   => Status2::Deleteing->value(),
-            ActionType::Ban->value()      => Status2::Ban->value(),
+            ACTION_TYPE::RESTRICT->value() => STATUS2::Restrict->value(),
+            ACTION_TYPE::NORMAL->value()   => STATUS2::Normal->value(),
+            ACTION_TYPE::DELETE->value()   => STATUS2::Deleteing->value(),
+            ACTION_TYPE::BAN->value()      => STATUS2::Ban->value(),
         ];
         $status = $list[$type->value()]??null;
         if(is_null($status)){
@@ -84,34 +84,34 @@ class Action
             throw new \LogicException("user - Action  save error. ");
 
         }
-        if($type === ActionType::Normal){
+        if($type === ACTION_TYPE::NORMAL){
             // 正常化处理,需要解除进行中的惩罚
             // 没有过期时间的
             UserAction::query()
                 ->where('user_id',$user_id)
-                ->where('status',ActionStatus::Ok)
+                ->where('status',ACTION_STATUS::OK)
 
-                ->whereNotIn('type',[ActionType::Normal])
+                ->whereNotIn('type',[ACTION_TYPE::NORMAL])
                 ->update([
-                    'status'=>ActionStatus::End->value
+                    'status'=>ACTION_STATUS::END->value
                 ]);
             // 生效中
             UserAction::query()
                 ->where('user_id',$user_id)
-                ->where('status',ActionStatus::Ing)
-                ->whereNotIn('type',[ActionType::Normal])
+                ->where('status',ACTION_STATUS::ING)
+                ->whereNotIn('type',[ACTION_TYPE::NORMAL])
                 ->update([
-                    'status'=>ActionStatus::End->value
+                    'status'=>ACTION_STATUS::END->value
                 ]);
         }
         Logger::info('type',[$type->value()]);
 
-        if($type === ActionType::Ban){
+        if($type === ACTION_TYPE::BAN){
             // 禁止
             Logger::info('ban');
             SessionApp::removeUKeys($user_id);
         }
-        if($type === ActionType::Restrict){
+        if($type === ACTION_TYPE::RESTRICT){
             // 限制登陆
             Logger::info('Restrict');
             SessionApp::removeUKeys($user_id);
@@ -133,7 +133,7 @@ class Action
          * @var UserAction[] $list
          */
         $list = UserAction::query()
-            ->where('status', ActionStatus::Ing)
+            ->where('status', ACTION_STATUS::ING)
             ->where('exp_time','>',0)
             ->where('exp_time','<',$time)
             ->limit(10)
@@ -143,7 +143,7 @@ class Action
 
             try {
                 DB::beginTransaction();
-                $item->status = ActionStatus::OutTime;
+                $item->status = ACTION_STATUS::OUT_TIME;
                 $item->save();
                 self::callItem($item);
                 DB::commit();
@@ -166,7 +166,7 @@ class Action
         $type = $action->type->value();
         // 判断是否存在其他生效的禁令
         $lsit = UserAction::query()
-            ->where('status', '=', ActionStatus::Ing)
+            ->where('status', '=', ACTION_STATUS::ING)
             ->where('user_id','=',$action->user_id)
             ->where('type','=', $action->type)
             ->where(function ( \Illuminate\Database\Eloquent\Builder $builder) {
@@ -181,20 +181,20 @@ class Action
             return;
         }
         $info = User::infoinfo($action->user_id,true);
-        if($action->type === ActionType::Ban){
-            if($info->status2 === Status2::Ban){
+        if($action->type === ACTION_TYPE::BAN){
+            if($info->status2 === STATUS2::Ban){
                 // 接触 封禁
-                self::call_type(\App\Module\Sys\Admin::AUTO_BOT,$action->user_id,"到期自动解除-封禁",$action->id,'ActionAuto',ActionType::Normal,0);
+                self::call_type(\App\Module\Sys\Admin::AUTO_BOT,$action->user_id,"到期自动解除-封禁",$action->id,'ActionAuto',ACTION_TYPE::NORMAL,0);
                 Logger::info("callItem  $action->id  $type ban  ->Normal  ");
             }else{
                 Logger::info("callItem  $action->id  $type now no ban ");
             }
         }
 
-        if($action->type === ActionType::Restrict){
-            if($info->status2 === Status2::Restrict){
+        if($action->type === ACTION_TYPE::RESTRICT){
+            if($info->status2 === STATUS2::Restrict){
                 // 接触禁止登录
-                self::call_type(\App\Module\Sys\Admin::AUTO_BOT,$action->user_id,"到期自动解除-限制登录",$action->id,'ActionAuto',ActionType::Normal);
+                self::call_type(\App\Module\Sys\Admin::AUTO_BOT,$action->user_id,"到期自动解除-限制登录",$action->id,'ActionAuto',ACTION_TYPE::NORMAL);
                 Logger::info("callItem  $action->id  $type Restrict  ->Normal  ");
             }else{
                 Logger::info("callItem  $action->id  $type now no Restrict  ");

app/Module/User/Enums/ActionStatus.php → app/Module/User/Enums/ACTION_STATUS.php

@@ -10,28 +10,28 @@ use Illuminate\Contracts\Database\Query\Expression;
 /**
  * 触发状态
  */
-enum ActionStatus:int implements Expression
+enum ACTION_STATUS:int implements Expression
 {
     use EnumToInt,EnumCore,EnumExpression;
 
     /**
      * 生效中
      */
-    case Ing = 1;
+    case ING = 1;
 
 
     /**
      * 没有过期时间
      */
-    case Ok = 2;
+    case OK = 2;
 
     /**
      * 过期
      */
-    case OutTime = 9;
+    case OUT_TIME = 9;
 
     /**
      * 结束
      */
-    case End = 10;
-}
+    case END = 10;
+}

app/Module/User/Enums/ActionType.php → app/Module/User/Enums/ACTION_TYPE.php

@@ -7,27 +7,26 @@ use UCore\Enum\EnumExpression;
 use UCore\Enum\EnumName;
 use Illuminate\Contracts\Database\Query\Expression;
 
-enum ActionType  implements Expression
+enum ACTION_TYPE implements Expression
 {
     use EnumName,EnumCore,EnumExpression;
     /**
      * 封禁
      */
-    case Ban;
+    case BAN;
 
     /**
      * 禁止登录
      */
-    case Restrict;
+    case RESTRICT;
 
     /**
      * 删除
      */
-    case Delete;
+    case DELETE;
 
     /**
      * 正常化
      */
-    case Normal;
-
-}
+    case NORMAL;
+}

app/Module/User/Enums/PhoneStatus.php → app/Module/User/Enums/PHONE_STATUS.php

@@ -10,11 +10,9 @@ use Illuminate\Contracts\Database\Query\Expression;
 
 /**
  * 手机号码状态
- *
  */
-enum PhoneStatus: int implements Expression
+enum PHONE_STATUS: int implements Expression
 {
-
     use EnumToInt, EnumCore, EnumExpression;
 
     /**
@@ -31,5 +29,4 @@ enum PhoneStatus: int implements Expression
      * 等待验证
      */
     case WAIT_CHECK = 1;
-
-}
+}

app/Module/User/Enums/PhoneType.php → app/Module/User/Enums/PHONE_TYPE.php

@@ -9,11 +9,9 @@ use Illuminate\Contracts\Database\Query\Expression;
 
 /**
  * 手机号码类型
- *
  */
-enum PhoneType: int implements Expression
+enum PHONE_TYPE: int implements Expression
 {
-
     use EnumName, EnumCore, EnumExpression;
 
     /**
@@ -25,5 +23,4 @@ enum PhoneType: int implements Expression
      * 第三方认证
      */
     case THREE = 2;
-
-}
+}

app/Module/User/Enums/SecertPasswordStatus.php → app/Module/User/Enums/SECRET_PASSWORD_STATUS.php

@@ -8,12 +8,10 @@ use UCore\Enum\EnumName;
 use Illuminate\Contracts\Database\Query\Expression;
 
 /**
- * 手机号码状态
- *
+ * 安全密码状态
  */
-enum SecertPasswordStatus: int implements Expression
+enum SECRET_PASSWORD_STATUS: int implements Expression
 {
-
     use EnumName, EnumCore, EnumExpression;
 
     /**
@@ -30,5 +28,4 @@ enum SecertPasswordStatus: int implements Expression
      * 等待验证
      */
     case WAIT_CHECK = 1;
-
-}
+}

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

@@ -10,7 +10,7 @@ use Illuminate\Contracts\Database\Query\Expression;
 /**
  * 状态
  */
-enum Status: int  implements Expression
+enum STATUS: int  implements Expression
 {
 
     use EnumToInt,EnumCore,EnumExpression;

app/Module/User/Enums/Status2.php → app/Module/User/Enums/STATUS2.php

@@ -11,7 +11,7 @@ use Illuminate\Contracts\Database\Query\Expression;
  * 状态2
  *
  */
-enum Status2: int  implements Expression
+enum STATUS2: int  implements Expression
 {
 
     use EnumToInt, EnumCore,EnumExpression;

app/Module/User/Models/UserAction.php

@@ -3,8 +3,8 @@
 namespace App\Module\User\Models;
 
 use UCore\ModelCore;
-use App\Module\User\Enums\ActionStatus;
-use App\Module\User\Enums\ActionType;
+use App\Module\User\Enums\ACTION_STATUS;
+use App\Module\User\Enums\ACTION_TYPE;
 
 /**
  *
@@ -28,8 +28,8 @@ use App\Module\User\Enums\ActionType;
 class UserAction extends ModelCore
 {
     protected $casts = [
-        'type'   => ActionType::class,
-        'status' => ActionStatus::class
+        'type'   => ACTION_TYPE::class,
+        'status' => ACTION_STATUS::class
     ];
 
 

app/Module/User/Models/UserInfo.php

@@ -2,10 +2,11 @@
 
 namespace App\Module\User\Models;
 
+use App\Module\User\Enums\PHONE_STATUS;
+
 use App\Module\Merchant\Model\Merchant;
-use App\Module\User\Enums\PhoneStatus;
-use App\Module\User\Enums\Status;
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\STATUS;
+use App\Module\User\Enums\STATUS2;
 use App\Module\User\Models\Events\UserInfoSaved;
 use App\Module\User\Models\Events\UserInfoUpdate;
 use UCore\ModelCore;
@@ -39,7 +40,7 @@ class UserInfo extends \UCore\ModelCore
     protected $primaryKey = 'user_id';
 
     protected $casts = [
-        'status' => Status::class,
+        'status' => STATUS::class,
     ];
 
     protected $dispatchesEvents = [
@@ -59,7 +60,7 @@ class UserInfo extends \UCore\ModelCore
 
     public function user_phone(): HasOne
     {
-        return $this->hasOne(UserPhone::class, 'user_id', 'user_id')->where('status', '=', PhoneStatus::BIND);
+        return $this->hasOne(UserPhone::class, 'user_id', 'user_id')->where('status', '=', PHONE_STATUS::BIND);
     }
 
 }

app/Module/User/Models/UserPhone.php

@@ -3,9 +3,9 @@
 namespace App\Module\User\Models;
 
 use App\Module\Merchant\Model\Merchant;
-use App\Module\User\Enums\PhoneStatus;
-use App\Module\User\Enums\Status;
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\PHONE_STATUS;
+use App\Module\User\Enums\STATUS;
+use App\Module\User\Enums\STATUS2;
 use App\Module\User\Models\Events\UserPhoneSaved;
 use App\Module\User\Models\Events\UserSaved;
 use App\Module\VOrder\Enums\Type;
@@ -37,7 +37,7 @@ class UserPhone extends \UCore\ModelCore
 
     protected $casts = [
         'type' => Type::class,
-        'status'=>PhoneStatus::class
+        'status'=>PHONE_STATUS::class
     ];
 
     protected $dispatchesEvents = [

app/Module/User/Models/UserSecretPassword.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Models;
 
-use App\Module\User\Enums\SecertPasswordStatus;
+use App\Module\User\Enums\SECRET_PASSWORD_STATUS;
 use App\Module\User\Models\Events\UserPhoneSaved;
 use App\Module\User\Models\Events\UserSecretPasswordSaved;
 use UCore\ModelCore;
@@ -28,7 +28,7 @@ class UserSecretPassword extends ModelCore
     protected $primaryKey = 'id';
 
     protected $casts = [
-        'status' => SecertPasswordStatus::class
+        'status' => SECRET_PASSWORD_STATUS::class
     ];
 
 

app/Module/User/Phone.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\User;
 
-use App\Module\User\Enums\PhoneStatus;
-use App\Module\User\Enums\PhoneType;
+use App\Module\User\Enums\PHONE_STATUS;
+use App\Module\User\Enums\PHONE_TYPE;
 use App\Module\User\Models\UserPhone;
 
 class Phone
@@ -17,12 +17,12 @@ class Phone
      * @param PhoneType $phoneType
      * @return UserPhone|false
      */
-    static public function bind($user_id, $phone, PhoneType $phoneType = PhoneType::SYS)
+    static public function bind($user_id, $phone, PHONE_TYPE $phoneType = PHONE_TYPE::SYS)
     {
         $new          = new UserPhone();
         $new->phone   = $phone;
         $new->user_id = $user_id;
-        $new->status  = PhoneStatus::BIND;
+        $new->status  = PHONE_STATUS::BIND;
         $new->type    = $phoneType;
 
 

app/Module/User/SecurityPassword.php

@@ -2,8 +2,9 @@
 
 namespace App\Module\User;
 
+use App\Module\User\Enums\SECRET_PASSWORD_STATUS;
+
 
-use App\Module\User\Enums\SecertPasswordStatus;
 use App\Module\User\Models\UserSecretPassword;
 use Carbon\Carbon;
 
@@ -20,7 +21,7 @@ class SecurityPassword
             $model->user_id = $user_id;
         }
         $model->secret_password = password_hash($auth_password,PASSWORD_DEFAULT);
-        $model->status= SecertPasswordStatus::BIND;
+        $model->status= SECRET_PASSWORD_STATUS::BIND;
         $model->last_check_at =Carbon::now();
         $model->save();
         return true;

app/Module/User/User.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User;
 
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\STATUS2;
 use App\Module\User\Unit\UserPublic;
 use Dcore\Db\Arr;
 use Dcore\Exception\LogicException;
@@ -26,7 +26,7 @@ class User
         $user           = new \App\Module\User\Models\User();
         $user->username = $username;
         $user->password = Hash::make($password);
-        $user->status2 = Status2::Normal;
+        $user->status2 = STATUS2::Normal;
         $res = $user->save();
 
         if(\App\Module\Sys\User::isSysUid($user->id)){

app/Module/User/UserOInfo.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User;
 
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\STATUS2;
 use App\Module\User\Models\UserInfo;
 use App\Module\User\Unit\UserPublic;
 use Dcore\Db\Arr;

app/Module/User/Validator/AutoRegPhone.php

@@ -2,8 +2,8 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\Outside\Api;
-use App\Module\User\Enums\PhoneStatus;
+
+
 use App\Module\User\Models\UserPhone;
 use App\Module\User\User;
 use UCore\Validator;

app/Module/User/Validator/CanLogin.php

@@ -2,7 +2,7 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\User\Enums\Status2;
+use App\Module\User\Enums\STATUS2;
 use UCore\Validator;
 use App\Module\User\Logic\User;
 
@@ -16,7 +16,7 @@ class CanLogin extends Validator
     public function validate(mixed $value, array $data): bool
     {
         $info = User::info($this->validation->user->id);
-        if ($info->status2 != Status2::Normal) {
+        if ($info->status2 != STATUS2::Normal) {
             return false;
         }
 

app/Module/User/Validator/PhoneAndCheck.php

@@ -2,10 +2,8 @@
 
 namespace App\Module\User\Validator;
 
-use App\Module\Outside\Api;
-use App\Module\User\Enums\PhoneStatus;
+
 use App\Module\User\Models\UserPhone;
-use App\Module\User\User;
 use UCore\Validator;
 
 use function _\uniq;
@@ -16,6 +14,7 @@ use function _\uniq;
  */
 class PhoneAndCheck extends Validator
 {
+
     public function validate(mixed $value, array $data): bool
     {
 
@@ -23,20 +22,9 @@ class PhoneAndCheck extends Validator
             ->where('phone', '=', $value)
             ->first();
         if (!$userPhone) {
-            //  注册,绑定手机号码
-
-            /**
-             * @var Api\CanPhoneLogin $api
-             */
-            $api = Api::getApiById(1,\App\Module\Outside\Enums\Api::CanPhoneLogin);
-            $res  = $api->request($value);
-            if(!$res){
-                return false;
-            }
-
+            return false;
         }
 
-
         return true;
     }