Преглед изворни кода

delete model Code, DetectBanLog and associated code

iamsaltedfish пре 3 година
родитељ
комит
20916e99ac

+ 0 - 8
app/routes.php

@@ -223,14 +223,6 @@ return function (SlimApp $app) {
         $this->get('/subscribe',                App\Controllers\Admin\SubscribeLogController::class . ':index');
         $this->post('/subscribe/ajax',          App\Controllers\Admin\SubscribeLogController::class . ':subscribe_ajax');
 
-        // Detect Ban Mange
-        $this->get('/detect/ban',               App\Controllers\Admin\DetectBanLogController::class . ':index');
-        $this->post('/detect/ban/ajax',         App\Controllers\Admin\DetectBanLogController::class . ':ajax_log');
-
-        // 指定用户充值记录
-        $this->get('/user/{id}/code',           App\Controllers\Admin\UserLog\CodeLogController::class . ':index');
-        $this->post('/user/{id}/code/ajax',     App\Controllers\Admin\UserLog\CodeLogController::class . ':ajax');
-
         // 指定用户订阅记录
         $this->get('/user/{id}/sublog',         App\Controllers\Admin\UserLog\SubLogController::class . ':index');
         $this->post('/user/{id}/sublog/ajax',   App\Controllers\Admin\UserLog\SubLogController::class . ':ajax');

+ 0 - 89
src/Controllers/Admin/DetectBanLogController.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Controllers\Admin;
-
-use App\Controllers\AdminController;
-use App\Models\DetectBanLog;
-use Psr\Http\Message\ResponseInterface;
-use Slim\Http\{
-    Request,
-    Response
-};
-
-class DetectBanLogController extends AdminController
-{
-    /**
-     * @param Request   $request
-     * @param Response  $response
-     * @param array     $args
-     */
-    public function index($request, $response, $args): ResponseInterface
-    {
-        $table_config['total_column'] = array(
-            'id'                => 'ID',
-            'user_id'           => '用户ID',
-            'user_name'         => '用户名',
-            'email'             => '用户邮箱',
-            'detect_number'     => '违规次数',
-            'ban_time'          => '封禁时长(分钟)',
-            'start_time'        => '统计开始时间',
-            'end_time'          => '统计结束以及封禁开始时间',
-            'ban_end_time'      => '封禁结束时间',
-            'all_detect_number' => '累计违规次数'
-        );
-        $table_config['default_show_column'] = array_keys($table_config['total_column']);
-        $table_config['ajax_url'] = 'ban/ajax';
-        return $response->write(
-            $this->view()
-                ->assign('table_config', $table_config)
-                ->display('admin/detect/ban.tpl')
-        );
-    }
-
-    /**
-     * @param Request   $request
-     * @param Response  $response
-     * @param array     $args
-     */
-    public function ajax_log($request, $response, $args): ResponseInterface
-    {
-        $query = DetectBanLog::getTableDataFromAdmin(
-            $request,
-            static function (&$order_field) {
-                if (in_array($order_field, ['ban_end_time'])) {
-                    $order_field = 'end_time';
-                }
-            }
-        );
-
-        $data  = [];
-        foreach ($query['datas'] as $value) {
-            /** @var DetectBanLog $value */
-
-            if ($value->user() == null) {
-                DetectBanLog::user_is_null($value);
-                continue;
-            }
-            $tempdata                         = [];
-            $tempdata['id']                   = $value->id;
-            $tempdata['user_id']              = $value->user_id;
-            $tempdata['user_name']            = $value->user_name;
-            $tempdata['email']                = $value->email;
-            $tempdata['detect_number']        = $value->detect_number;
-            $tempdata['ban_time']             = $value->ban_time;
-            $tempdata['start_time']           = $value->start_time();
-            $tempdata['end_time']             = $value->end_time();
-            $tempdata['ban_end_time']         = $value->ban_end_time();
-            $tempdata['all_detect_number']    = $value->all_detect_number;
-
-            $data[] = $tempdata;
-        }
-
-        return $response->withJson([
-            'draw'            => $request->getParam('draw'),
-            'recordsTotal'    => DetectBanLog::count(),
-            'recordsFiltered' => $query['count'],
-            'data'            => $data,
-        ]);
-    }
-}

+ 0 - 11
src/Controllers/Admin/UserController.php

@@ -1,7 +1,6 @@
 <?php
 namespace App\Controllers\Admin;
 
-use App\Models\DetectBanLog;
 use App\Models\Setting;
 use App\Models\Shop;
 use App\Models\User;
@@ -186,16 +185,6 @@ class UserController extends AdminController
             $user->enable                       = 0;
             $end_time                           = date('Y-m-d H:i:s');
             $user->last_detect_ban_time         = $end_time;
-            $DetectBanLog                       = new DetectBanLog();
-            $DetectBanLog->user_name            = $user->user_name;
-            $DetectBanLog->user_id              = $user->id;
-            $DetectBanLog->email                = $user->email;
-            $DetectBanLog->detect_number        = '0';
-            $DetectBanLog->ban_time             = $ban_time;
-            $DetectBanLog->start_time           = strtotime('1989-06-04 00:05:00');
-            $DetectBanLog->end_time             = strtotime($end_time);
-            $DetectBanLog->all_detect_number    = $user->all_detect_number;
-            $DetectBanLog->save();
         }
 
         if (!$user->save()) {

+ 0 - 1
src/Controllers/UserController.php

@@ -2,7 +2,6 @@
 namespace App\Controllers;
 
 use App\Models\Ann;
-use App\Models\Code;
 use App\Models\Coupon;
 use App\Models\DetectLog;
 use App\Models\DetectRule;

+ 0 - 89
src/Models/Code.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * Code Model
- */
-class Code extends Model
-{
-    protected $connection = 'default';
-
-    protected $table = 'code';
-
-    /**
-     * 用户
-     */
-    public function user(): ?User
-    {
-        return User::find($this->userid);
-    }
-
-    /**
-     * 用户 ID
-     */
-    public function userid(): string
-    {
-        return $this->userid == 0 ? '未使用' : $this->userid;
-    }
-
-    /**
-     * 用户名
-     */
-    public function user_name(): string
-    {
-        if ($this->userid == 0) {
-            return '未使用';
-        }
-        if ($this->user() == null) {
-            return '用户已不存在';
-        }
-        return $this->user()->user_name;
-    }
-
-    /**
-     * 类型
-     */
-    public function type(): string
-    {
-        switch ($this->type) {
-            case -1:
-                return '充值金额';
-            case -2:
-                return '财务支出';
-            default:
-                return '已经废弃';
-        }
-    }
-
-    /**
-     * 操作
-     */
-    public function number(): string
-    {
-        switch ($this->type) {
-            case -1:
-                return '充值 ' . $this->number . ' 元';
-            case -2:
-                return '支出 ' . $this->number . ' 元';
-            default:
-                return '已经废弃';
-        }
-    }
-
-    /**
-     * 是否已经使用
-     */
-    public function isused(): string
-    {
-        return $this->isused == 1 ? '已使用' : '未使用';
-    }
-
-    /**
-     * 使用时间
-     */
-    public function usedatetime(): string
-    {
-        return $this->usedatetime > '2000-1-1 0:0:0' ? $this->usedatetime : '未使用';
-    }
-}

+ 0 - 52
src/Models/DetectBanLog.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Models;
-
-class DetectBanLog extends Model
-{
-    protected $connection = "default";
-
-    protected $table = "detect_ban_log";
-
-    /**
-     * [静态方法] 删除不存在的用户的记录
-     *
-     * @param DetectBanLog $DetectBanLog
-     */
-    public static function user_is_null($DetectBanLog): void
-    {
-        self::where('user_id', $DetectBanLog->user_id)->delete();
-    }
-
-    /**
-     * 用户
-     */
-    public function user(): ?User
-    {
-        return User::find($this->user_id);
-    }
-
-    /**
-     * 统计开始时间
-     */
-    public function start_time(): string
-    {
-        return date('Y-m-d H:i:s', $this->start_time);
-    }
-
-    /**
-     * 统计结束以及封禁开始时间
-     */
-    public function end_time(): string
-    {
-        return date('Y-m-d H:i:s', $this->end_time);
-    }
-
-    /**
-     * 封禁结束时间
-     */
-    public function ban_end_time(): string
-    {
-        return date('Y-m-d H:i:s', $this->end_time + $this->ban_time * 60);
-    }
-}

+ 3 - 11
src/Models/User.php

@@ -453,7 +453,6 @@ class User extends Model
         $email = $this->email;
 
         Code::where('userid', '=', $uid)->delete();
-        DetectBanLog::where('user_id', '=', $uid)->delete();
         DetectLog::where('user_id', '=', $uid)->delete();
         EmailVerify::where('email', $email)->delete();
         InviteCode::where('user_id', '=', $uid)->delete();
@@ -535,13 +534,7 @@ class User extends Model
      */
     public function relieve_time(): string
     {
-        $logs = DetectBanLog::where('user_id', $this->id)->orderBy('id', 'desc')->first();
-        if ($this->enable == 0 && $logs != null) {
-            $time = ($logs->end_time + $logs->ban_time * 60);
-            return date('Y-m-d H:i:s', $time);
-        } else {
-            return '当前未被封禁';
-        }
+        return '当前未被封禁';
     }
 
     /**
@@ -549,7 +542,7 @@ class User extends Model
      */
     public function detect_ban_number(): int
     {
-        return DetectBanLog::where('user_id', $this->id)->count();
+        return 0;
     }
 
     /**
@@ -557,8 +550,7 @@ class User extends Model
      */
     public function user_detect_ban_number(): int
     {
-        $logs = DetectBanLog::where('user_id', $this->id)->orderBy('id', 'desc')->first();
-        return $logs->detect_number;
+        return 0;
     }
 
     /**