From e234ba6d6063c576dc5c93c338f756e4aaaf5953 Mon Sep 17 00:00:00 2001 From: daodao97 Date: Sat, 24 Oct 2020 15:06:26 +0800 Subject: [PATCH] fix: up db create_at to created_at --- src/admin/src/Controller/AdminAbstractController.php | 2 +- src/admin/src/Controller/LogController.php | 12 ++++++------ src/admin/src/Controller/RoleController.php | 8 ++++---- src/admin/src/Controller/UserController.php | 6 +++--- src/admin/src/Model/RequestLog.php | 4 ++-- src/admin/src/Model/Role.php | 4 ++-- src/admin/src/Model/RoleMenu.php | 4 ++-- src/admin/src/Model/User.php | 4 ++-- src/admin/src/Model/UserRole.php | 4 ++-- src/admin/src/Model/Version.php | 4 ++-- src/admin/src/Service/ExportService.php | 2 +- .../src/Scaffold/Controller/AbstractController.php | 2 +- src/config-center/src/Model/ConfigCenter.php | 4 ++-- .../src/Controller/CronNodeController.php | 6 +++--- src/cron-center/src/CronManager.php | 2 +- src/data-focus/src/Model/Dsn.php | 4 ++-- src/data-focus/src/Model/PluginFunction.php | 4 ++-- src/data-focus/src/Model/ReportChangeLog.php | 2 +- src/data-focus/src/Model/Reports.php | 4 ++-- src/data-focus/src/Service/Dsn.php | 2 +- src/dev-tools/src/Controller/DevController.php | 2 +- src/dev-tools/src/ModelMaker.php | 6 +++--- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/admin/src/Controller/AdminAbstractController.php b/src/admin/src/Controller/AdminAbstractController.php index 0dc28a2..e613a19 100644 --- a/src/admin/src/Controller/AdminAbstractController.php +++ b/src/admin/src/Controller/AdminAbstractController.php @@ -72,7 +72,7 @@ abstract class AdminAbstractController extends AbstractController $user = User::query()->find($last->user_id); return $this->success([ 'has_new_version' => true, - 'message' => sprintf("%s在%s保存了新的数据, 请刷新页面获取最新数据", $user->username, $last->create_at), + 'message' => sprintf("%s在%s保存了新的数据, 请刷新页面获取最新数据", $user->username, $last->created_at), ]); } diff --git a/src/admin/src/Controller/LogController.php b/src/admin/src/Controller/LogController.php index 709fed1..ab2283a 100644 --- a/src/admin/src/Controller/LogController.php +++ b/src/admin/src/Controller/LogController.php @@ -22,7 +22,7 @@ class LogController extends AdminAbstractController 'relation_ids', 'client_ip', 'detail_json', - 'create_at', + 'created_at', ], 'formUI' => [ 'form' => [ @@ -47,7 +47,7 @@ class LogController extends AdminAbstractController ], ], 'detail_json|其他内容' => 'string', - 'create_at|记录时间' => [ + 'created_at|记录时间' => [ 'type' => 'date_range', ], ], @@ -59,7 +59,7 @@ class LogController extends AdminAbstractController ], ['field' => 'id', 'title' => 'ID', 'hidden' => true], [ - 'field' => 'create_at', + 'field' => 'created_at', 'title' => '记录时间', 'width' => '150px', ], @@ -137,9 +137,9 @@ class LogController extends AdminAbstractController $filters[$field] = ['like' => "%$filter%"]; } } - if (!empty($filters['create_at']['between'])) { - $filters['create_at']['between'][0] = Carbon::parse($filters['create_at']['between'][0])->toDateTimeString(); - $filters['create_at']['between'][1] = Carbon::parse($filters['create_at']['between'][1] . ' +1 day last second') + if (!empty($filters['created_at']['between'])) { + $filters['created_at']['between'][0] = Carbon::parse($filters['created_at']['between'][0])->toDateTimeString(); + $filters['created_at']['between'][1] = Carbon::parse($filters['created_at']['between'][1] . ' +1 day last second') ->toDateTimeString(); } unset($filters); diff --git a/src/admin/src/Controller/RoleController.php b/src/admin/src/Controller/RoleController.php index b27db1b..6d63802 100644 --- a/src/admin/src/Controller/RoleController.php +++ b/src/admin/src/Controller/RoleController.php @@ -164,8 +164,8 @@ class RoleController extends AdminAbstractController $role_menus[] = [ 'role_id' => $pk_val, 'router_id' => (int)$menu_id, - 'create_at' => date('Y-m-d H:i:s'), - 'update_at' => date('Y-m-d H:i:s'), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]; } if (!empty($role_menus)) { @@ -181,8 +181,8 @@ class RoleController extends AdminAbstractController $user_role_ids[] = [ 'role_id' => $pk_val, 'user_id' => (int)$user_id, - 'create_at' => date('Y-m-d H:i:s'), - 'update_at' => date('Y-m-d H:i:s'), + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]; } if (!empty($user_role_ids)) { diff --git a/src/admin/src/Controller/UserController.php b/src/admin/src/Controller/UserController.php index 7353911..79e7557 100644 --- a/src/admin/src/Controller/UserController.php +++ b/src/admin/src/Controller/UserController.php @@ -22,7 +22,7 @@ class UserController extends AdminAbstractController 'createAble' => true, 'deleteAble' => true, 'defaultList' => true, - 'filter' => ['realname%', 'username%', 'create_at'], + 'filter' => ['realname%', 'username%', 'created_at'], 'form' => [ 'id' => 'int', 'username|登录账号' => [ @@ -85,7 +85,7 @@ class UserController extends AdminAbstractController $data['props']['options'] = $this->permission_service->getRoleTree(); }, ], - 'create_at|创建时间' => [ + 'created_at|创建时间' => [ 'form' => false, 'type' => 'date_range', ], @@ -284,7 +284,7 @@ class UserController extends AdminAbstractController 'total_pages', 'current_page', 'download_url', - 'create_at', + 'created_at', ]); return $this->success([ diff --git a/src/admin/src/Model/RequestLog.php b/src/admin/src/Model/RequestLog.php index 6af2239..f18f2c2 100644 --- a/src/admin/src/Model/RequestLog.php +++ b/src/admin/src/Model/RequestLog.php @@ -6,9 +6,9 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; class RequestLog extends BaseModel { - const CREATED_AT = 'create_at'; + const CREATED_AT = 'created_at'; - const UPDATED_AT = 'update_at'; + const UPDATED_AT = 'updated_at'; protected $connection = 'hyperf_admin'; diff --git a/src/admin/src/Model/Role.php b/src/admin/src/Model/Role.php index 9d9306e..1d8e5e1 100644 --- a/src/admin/src/Model/Role.php +++ b/src/admin/src/Model/Role.php @@ -10,8 +10,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property string $name * @property int $status * @property int $sort - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class Role extends BaseModel { diff --git a/src/admin/src/Model/RoleMenu.php b/src/admin/src/Model/RoleMenu.php index b698767..0ac58e7 100644 --- a/src/admin/src/Model/RoleMenu.php +++ b/src/admin/src/Model/RoleMenu.php @@ -7,8 +7,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; /** * @property int $role_id * @property int $router_id - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class RoleMenu extends BaseModel { diff --git a/src/admin/src/Model/User.php b/src/admin/src/Model/User.php index e7682bf..3b8774e 100644 --- a/src/admin/src/Model/User.php +++ b/src/admin/src/Model/User.php @@ -21,8 +21,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property string $sign * @property string $avatar * @property string $avatar_small - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class User extends BaseModel { diff --git a/src/admin/src/Model/UserRole.php b/src/admin/src/Model/UserRole.php index 2aeb82b..9358653 100644 --- a/src/admin/src/Model/UserRole.php +++ b/src/admin/src/Model/UserRole.php @@ -8,8 +8,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property int $id * @property int $user_id * @property int $role_id - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class UserRole extends BaseModel { diff --git a/src/admin/src/Model/Version.php b/src/admin/src/Model/Version.php index e44cf01..3b90cda 100644 --- a/src/admin/src/Model/Version.php +++ b/src/admin/src/Model/Version.php @@ -6,8 +6,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; class Version extends BaseModel { - const CREATED_AT = 'create_at'; - const UPDATED_AT = 'update_at'; + const CREATED_AT = 'created_at'; + const UPDATED_AT = 'updated_at'; protected $connection = 'hyperf_admin'; diff --git a/src/admin/src/Service/ExportService.php b/src/admin/src/Service/ExportService.php index e62ef13..6d25137 100644 --- a/src/admin/src/Service/ExportService.php +++ b/src/admin/src/Service/ExportService.php @@ -191,7 +191,7 @@ class ExportService return ExportTasks::where('filters', json_encode($filters)) ->where('list_api', $url) ->where('operator_id', $operator_id) - ->where('create_at', '>=', Carbon::today()->toDateTimeString()) + ->where('created_at', '>=', Carbon::today()->toDateTimeString()) ->where('status', '!=', ExportTasks::STATUS_SUCCESS) ->first(); } diff --git a/src/base-utils/src/Scaffold/Controller/AbstractController.php b/src/base-utils/src/Scaffold/Controller/AbstractController.php index c342511..1255969 100644 --- a/src/base-utils/src/Scaffold/Controller/AbstractController.php +++ b/src/base-utils/src/Scaffold/Controller/AbstractController.php @@ -1299,7 +1299,7 @@ abstract class AbstractController extends Controller } return $this->success([ 'has_new_version' => true, - 'message' => sprintf("%s有新的数据产生, 请刷新页面获取最新数据", $last->create_at), + 'message' => sprintf("%s有新的数据产生, 请刷新页面获取最新数据", $last->created_at), ]); } } diff --git a/src/config-center/src/Model/ConfigCenter.php b/src/config-center/src/Model/ConfigCenter.php index 8c36384..df63513 100644 --- a/src/config-center/src/Model/ConfigCenter.php +++ b/src/config-center/src/Model/ConfigCenter.php @@ -11,8 +11,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property int $create_uid 创建者id * @property int $is_locked 是否被锁定 * @property string $owner_uids 所有者 - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class ConfigCenter extends BaseModel { diff --git a/src/cron-center/src/Controller/CronNodeController.php b/src/cron-center/src/Controller/CronNodeController.php index f07167a..f6851ab 100644 --- a/src/cron-center/src/Controller/CronNodeController.php +++ b/src/cron-center/src/Controller/CronNodeController.php @@ -36,7 +36,7 @@ class CronNodeController extends AbstractController YES => 'success', ], ], - 'update_at|最后活跃时间' => '', + 'updated_at|最后活跃时间' => '', ], 'table' => [ 'columns' => [ @@ -51,7 +51,7 @@ class CronNodeController extends AbstractController CronNodes::STATUS_LOSS => 'danger', ], 'render' => function ($status, $row) { - if ((time() - strtotime($row['update_at'])) > 60) { + if ((time() - strtotime($row['updated_at'])) > 60) { return CronNodes::STATUS_LOSS; } @@ -59,7 +59,7 @@ class CronNodeController extends AbstractController }, 'info' => '下线表示节点已经丢失, 不可用, 锁定表示节点存活, 但人为锁定, 将不执行任何任务', ], - 'update_at', + 'updated_at', ], 'rowActions' => [ [ diff --git a/src/cron-center/src/CronManager.php b/src/cron-center/src/CronManager.php index 72cfa91..3bb41ff 100644 --- a/src/cron-center/src/CronManager.php +++ b/src/cron-center/src/CronManager.php @@ -173,7 +173,7 @@ class CronManager if ($has) { $data = [ 'status' => $has['status'] === 2 ? 2 : 1, - 'update_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]; $nodes->where(['name' => $node_name])->update($data); } else { diff --git a/src/data-focus/src/Model/Dsn.php b/src/data-focus/src/Model/Dsn.php index 54bde32..aa77ca5 100644 --- a/src/data-focus/src/Model/Dsn.php +++ b/src/data-focus/src/Model/Dsn.php @@ -12,8 +12,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property array $config 配置 * @property int $status 状态 * @property int $create_uid 创建者id - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class Dsn extends BaseModel { diff --git a/src/data-focus/src/Model/PluginFunction.php b/src/data-focus/src/Model/PluginFunction.php index 8469d7e..e163093 100644 --- a/src/data-focus/src/Model/PluginFunction.php +++ b/src/data-focus/src/Model/PluginFunction.php @@ -11,8 +11,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property string $context 方法体定义 * @property int $create_uid 创建者id * @property int $status 状态 - * @property \Carbon\Carbon $create_at - * @property \Carbon\Carbon $update_at + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at */ class PluginFunction extends BaseModel { diff --git a/src/data-focus/src/Model/ReportChangeLog.php b/src/data-focus/src/Model/ReportChangeLog.php index 3d7e8c8..ae827e2 100644 --- a/src/data-focus/src/Model/ReportChangeLog.php +++ b/src/data-focus/src/Model/ReportChangeLog.php @@ -10,7 +10,7 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property int $dev_uid 开发者id * @property string $dev_content 内容 * @property int $published 0未发布, 1已发布 - * @property \Carbon\Carbon $create_at + * @property \Carbon\Carbon $created_at */ class ReportChangeLog extends BaseModel { diff --git a/src/data-focus/src/Model/Reports.php b/src/data-focus/src/Model/Reports.php index ec4bc1b..68dca68 100644 --- a/src/data-focus/src/Model/Reports.php +++ b/src/data-focus/src/Model/Reports.php @@ -17,8 +17,8 @@ use HyperfAdmin\BaseUtils\Model\BaseModel; * @property string $crontab 定时任务 * @property string $config 配置 * @property \Carbon\Carbon $publish_at 最后一次发布时间 - * @property \Carbon\Carbon $create_at 创建时间 - * @property \Carbon\Carbon $update_at 最后更新时间 + * @property \Carbon\Carbon $created_at 创建时间 + * @property \Carbon\Carbon $updated_at 最后更新时间 */ class Reports extends BaseModel { diff --git a/src/data-focus/src/Service/Dsn.php b/src/data-focus/src/Service/Dsn.php index 8d6660d..b9ba3f7 100644 --- a/src/data-focus/src/Service/Dsn.php +++ b/src/data-focus/src/Service/Dsn.php @@ -81,7 +81,7 @@ class Dsn $last_check_time = Redis::get($key) ?: date('Y-m-d H:i:s'); $changed = DsnModel::query() ->select(['id']) - ->where('update_at', '>=', $last_check_time) + ->where('updated_at', '>=', $last_check_time) ->where('status', DsnModel::STATUS_YES) ->getAsArray(); if(!$changed) { diff --git a/src/dev-tools/src/Controller/DevController.php b/src/dev-tools/src/Controller/DevController.php index b466d8b..0158b40 100644 --- a/src/dev-tools/src/Controller/DevController.php +++ b/src/dev-tools/src/Controller/DevController.php @@ -294,7 +294,7 @@ class DevController extends AbstractController $tool = make(TableSchema::class); $schema = $tool->tableSchema($pool, $db, $table); $ret = []; - $ignores = ['id', 'create_at', 'update_at', 'is_deleted']; + $ignores = ['id', 'created_at', 'updated_at', 'is_deleted']; foreach ($schema as $item) { if (in_array($item['COLUMN_NAME'], $ignores)) { continue; diff --git a/src/dev-tools/src/ModelMaker.php b/src/dev-tools/src/ModelMaker.php index 19bdde0..605da19 100644 --- a/src/dev-tools/src/ModelMaker.php +++ b/src/dev-tools/src/ModelMaker.php @@ -23,8 +23,8 @@ class ModelMaker extends AbstractMaker } $columns = array_values(array_filter(array_map(function ($item) { if(in_array($item['COLUMN_NAME'], [ - 'create_at', - 'update_at', + 'created_at', + 'updated_at', 'is_deleted', ])) { return null; @@ -47,7 +47,7 @@ class ModelMaker extends AbstractMaker $casts[$name] = $type; $params_doc .= sprintf('@property %s $%s %s', $type, $name, $comment) . PHP_EOL; } - unset($casts['id'], $casts['update_at'], $casts['create_at']); + unset($casts['id'], $casts['updated_at'], $casts['created_at']); $class->setComment($params_doc); $class->addProperty('connection', $pool)->setProtected(); $class->addProperty('table', $table)->setProtected();