Ken 1 周之前
父节点
当前提交
5e58ab0b23
共有 8 个文件被更改,包括 10 次插入204 次删除
  1. 1 26
      app/Models/Role.php
  2. 1 25
      app/Models/RoleMenu.php
  3. 2 26
      app/Models/RoleUser.php
  4. 1 25
      app/Models/Room.php
  5. 1 26
      app/Models/RoomUser.php
  6. 2 23
      app/Models/User.php
  7. 1 24
      app/Models/UserGame.php
  8. 1 29
      app/Models/Wallet.php

+ 1 - 26
app/Models/Role.php

@@ -1,37 +1,12 @@
 <?php
-
-
-
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * Admin
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class Role extends Authenticatable
+class Role extends BaseModel
 {
-    use HasApiTokens, Notifiable;
     protected $table = 'roles';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['name', 'display_name', 'description' ];
     protected $appends = ['menus_ids', 'menus_uris'];
 
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
     public function users()
     {
         return $this->belongsToMany(Admin::class, 'role_user', 'role_id', 'user_id');

+ 1 - 25
app/Models/RoleMenu.php

@@ -1,32 +1,8 @@
 <?php
-
-
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * Admin
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class RoleMenu extends Authenticatable
+class RoleMenu extends BaseModel
 {
-    use HasApiTokens, Notifiable;
     protected $table = 'role_menu';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['menu_id', 'role_id' ];
-
-    // protected function getCreatedAtAttribute($value)
-    // {
-    //     return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    // }
-
-    // protected function getUpdatedAtAttribute($value)
-    // {
-    //     return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    // }
 }

+ 2 - 26
app/Models/RoleUser.php

@@ -1,33 +1,9 @@
 <?php
-
-
-
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * Admin
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class RoleUser extends Authenticatable
+class RoleUser extends BaseModel
 {
-    use HasApiTokens, Notifiable;
+
     protected $table = 'role_user';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['user_id', 'role_id' ];
-
-    // protected function getCreatedAtAttribute($value)
-    // {
-    //     return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    // }
-
-    // protected function getUpdatedAtAttribute($value)
-    // {
-    //     return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    // }
 }

+ 1 - 25
app/Models/Room.php

@@ -1,32 +1,8 @@
 <?php
-
-
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class Room extends Authenticatable
+class Room extends BaseModel
 {
-    use HasApiTokens, Notifiable;
-
     protected $table = 'rooms';
-    // protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['room_id', 'member_id', 'status', 'game_name', 'base_score', 'join_count', 'participants', 'rounds','introduction'];
-
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
 }

+ 1 - 26
app/Models/RoomUser.php

@@ -1,23 +1,8 @@
 <?php
-
-
 namespace App\Models;
-
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class RoomUser extends Authenticatable
+class RoomUser extends BaseModel
 {
-    use HasApiTokens, Notifiable;
     protected $table = 'room_users';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['room_id', 'member_id', 'game_id', 'status', 'score', 'screenshot', 'game_id', 'first_name'];
 
 
@@ -40,14 +25,4 @@ class RoomUser extends Authenticatable
     {
         return floatval($value);
     }
-
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
 }

+ 2 - 23
app/Models/User.php

@@ -2,29 +2,18 @@
 
 namespace App\Models;
 
-use App\Constants\HttpStatus;
-use App\Constants\Util;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-use Illuminate\Database\Eloquent\Builder;
-
 /**
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
  * @property int $id
  * @property string $member_id
  * @property string $username
  * @property string $first_name
  * @property string $language
  */
-class User extends Authenticatable
+class User extends BaseModel
 {
-    use HasApiTokens, Notifiable;
+
 
     protected $table = 'users';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['usdt', 'member_id', 'first_name', 'game_id', 'username', 'secret_key', 'secret_pass', 'language'];
 
     public function wallet()
@@ -52,14 +41,4 @@ class User extends Authenticatable
     {
         return $this->first_name;
     }
-
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
 }

+ 1 - 24
app/Models/UserGame.php

@@ -1,32 +1,9 @@
 <?php
 
-
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-
-/**
- * Admin
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class UserGame extends Authenticatable
+class UserGame extends BaseModel
 {
-    use HasApiTokens, Notifiable;
     protected $table = 'user_game';
-    protected $hidden = ['created_at', 'updated_at'];
     protected $fillable = ['game_name','game_id','member_id'];
-
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
 }

+ 1 - 29
app/Models/Wallet.php

@@ -1,35 +1,7 @@
 <?php
-
-
 namespace App\Models;
-
-use App\Constants\HttpStatus;
-use App\Constants\Util;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-
-use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\HasApiTokens;
-use Illuminate\Database\Eloquent\Builder;
-
-/**
- * @mixin Builder
- * @method static Builder|static where($column, $operator = null, $value = null, $boolean = 'and')
- */
-class Wallet extends Authenticatable
+class Wallet extends BaseModel
 {
-    use HasApiTokens, Notifiable;
-
     protected $table = 'wallets';
-    protected $hidden = ['created_at', 'updated_at'];
     // protected $fillable = ['user_id','member_id', 'coin', 'available_balance','frozen_balance','total_balance'];
-
-    protected function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
-
-    protected function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->setTimezone('Asia/Shanghai')->format('Y-m-d H:i:s');
-    }
 }