From 75b6929648169e9dce97737177616cba73052d66 Mon Sep 17 00:00:00 2001 From: zds <49744633+zds-s@users.noreply.github.com> Date: Wed, 15 Jan 2025 20:59:01 +0800 Subject: [PATCH 1/3] ci: update code coverage and simplify phone number validation - Update .gitignore to include tests/coverage directory - Modify GitHub Actions workflow to use correct coverage file path - Remove regex validation for phone number in UserRequest --- app/Model/Attachment.php | 5 ++--- app/Model/Permission/User.php | 4 ++-- app/Repository/Logstash/UserOperationLogRepository.php | 3 --- app/Schema/AttachmentSchema.php | 6 +----- app/Schema/RoleSchema.php | 6 +----- app/Schema/UserOperationLogSchema.php | 6 +----- app/Schema/UserSchema.php | 6 +----- storage/languages/en/user.php | 1 - storage/languages/zh_CN/user.php | 1 - storage/languages/zh_TW/user.php | 1 - 10 files changed, 8 insertions(+), 31 deletions(-) diff --git a/app/Model/Attachment.php b/app/Model/Attachment.php index f6c1cb65..2122e85d 100644 --- a/app/Model/Attachment.php +++ b/app/Model/Attachment.php @@ -31,7 +31,6 @@ * @property int $updated_by 更新者 * @property Carbon $created_at 创建时间 * @property Carbon $updated_at 更新时间 - * @property Carbon $deleted_at 删除时间 * @property string $remark 备注 */ final class Attachment extends MineModel @@ -44,10 +43,10 @@ final class Attachment extends MineModel /** * The attributes that are mass assignable. */ - protected array $fillable = ['id', 'storage_mode', 'origin_name', 'object_name', 'hash', 'mime_type', 'storage_path', 'suffix', 'size_byte', 'size_info', 'url', 'created_by', 'updated_by', 'created_at', 'updated_at', 'deleted_at', 'remark']; + protected array $fillable = ['id', 'storage_mode', 'origin_name', 'object_name', 'hash', 'mime_type', 'storage_path', 'suffix', 'size_byte', 'size_info', 'url', 'created_by', 'updated_by', 'created_at', 'updated_at','remark']; /** * The attributes that should be cast to native types. */ - protected array $casts = ['id' => 'integer', 'storage_mode' => 'integer', 'size_byte' => 'integer', 'created_by' => 'integer', 'updated_by' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime']; + protected array $casts = ['id' => 'integer', 'storage_mode' => 'integer', 'size_byte' => 'integer', 'created_by' => 'integer', 'updated_by' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime',]; } diff --git a/app/Model/Permission/User.php b/app/Model/Permission/User.php index 4dfce979..313b4728 100644 --- a/app/Model/Permission/User.php +++ b/app/Model/Permission/User.php @@ -53,12 +53,12 @@ final class User extends Model * 隐藏的字段列表. * @var string[] */ - protected array $hidden = ['password', 'deleted_at']; + protected array $hidden = ['password']; /** * The attributes that are mass assignable. */ - protected array $fillable = ['id', 'username', 'password', 'user_type', 'nickname', 'phone', 'email', 'avatar', 'signed', 'status', 'login_ip', 'login_time', 'backend_setting', 'created_by', 'updated_by', 'created_at', 'updated_at', 'deleted_at', 'remark']; + protected array $fillable = ['id', 'username', 'password', 'user_type', 'nickname', 'phone', 'email', 'avatar', 'signed', 'status', 'login_ip', 'login_time', 'backend_setting', 'created_by', 'updated_by', 'created_at', 'updated_at', 'remark']; /** * The attributes that should be cast to native types. diff --git a/app/Repository/Logstash/UserOperationLogRepository.php b/app/Repository/Logstash/UserOperationLogRepository.php index d6e00c42..7b17ba24 100644 --- a/app/Repository/Logstash/UserOperationLogRepository.php +++ b/app/Repository/Logstash/UserOperationLogRepository.php @@ -46,9 +46,6 @@ public function handleSearch(Builder $query, array $params): Builder }) ->when(Arr::get($params, 'updated_at'), static function (Builder $query, $updated_at) { $query->whereBetween('updated_at', $updated_at); - }) - ->when(Arr::get($params, 'deleted_at'), static function (Builder $query, $deleted_at) { - $query->whereBetween('deleted_at', $deleted_at); }); } } diff --git a/app/Schema/AttachmentSchema.php b/app/Schema/AttachmentSchema.php index 1e983be7..55dbb8b8 100644 --- a/app/Schema/AttachmentSchema.php +++ b/app/Schema/AttachmentSchema.php @@ -64,9 +64,6 @@ final class AttachmentSchema implements \JsonSerializable #[Property(property: 'updated_at', title: '', type: 'mixed')] public mixed $updatedAt; - #[Property(property: 'deleted_at', title: '', type: 'mixed')] - public mixed $deletedAt; - #[Property(property: 'remark', title: '备注', type: 'string')] public ?string $remark; @@ -87,12 +84,11 @@ public function __construct(Attachment $model) $this->updatedBy = $model->updated_by; $this->createdAt = $model->created_at; $this->updatedAt = $model->updated_at; - $this->deletedAt = $model->deleted_at; $this->remark = $model->remark; } public function jsonSerialize(): mixed { - return ['id' => $this->id, 'storage_mode' => $this->storageMode, 'origin_name' => $this->originName, 'object_name' => $this->objectName, 'hash' => $this->hash, 'mime_type' => $this->mimeType, 'storage_path' => $this->storagePath, 'suffix' => $this->suffix, 'size_byte' => $this->sizeByte, 'size_info' => $this->sizeInfo, 'url' => $this->url, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'deleted_at' => $this->deletedAt, 'remark' => $this->remark]; + return ['id' => $this->id, 'storage_mode' => $this->storageMode, 'origin_name' => $this->originName, 'object_name' => $this->objectName, 'hash' => $this->hash, 'mime_type' => $this->mimeType, 'storage_path' => $this->storagePath, 'suffix' => $this->suffix, 'size_byte' => $this->sizeByte, 'size_info' => $this->sizeInfo, 'url' => $this->url, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; } } diff --git a/app/Schema/RoleSchema.php b/app/Schema/RoleSchema.php index 9fcc1590..6919bc80 100644 --- a/app/Schema/RoleSchema.php +++ b/app/Schema/RoleSchema.php @@ -50,9 +50,6 @@ final class RoleSchema implements \JsonSerializable #[Property(property: 'updated_at', title: '', type: 'string')] public string $updatedAt; - #[Property(property: 'deleted_at', title: '', type: 'string')] - public string $deletedAt; - #[Property(property: 'remark', title: '备注', type: 'string')] public ?string $remark; @@ -68,12 +65,11 @@ public function __construct(Role $model) $this->updatedBy = $model->updated_by; $this->createdAt = $model->created_at; $this->updatedAt = $model->updated_at->format(CarbonInterface::DEFAULT_TO_STRING_FORMAT); - $this->deletedAt = $model->deleted_at->format(CarbonInterface::DEFAULT_TO_STRING_FORMAT); $this->remark = $model->remark; } public function jsonSerialize(): mixed { - return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'deleted_at' => $this->deletedAt, 'remark' => $this->remark]; + return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; } } diff --git a/app/Schema/UserOperationLogSchema.php b/app/Schema/UserOperationLogSchema.php index 904e8d5b..0ad578a4 100644 --- a/app/Schema/UserOperationLogSchema.php +++ b/app/Schema/UserOperationLogSchema.php @@ -61,9 +61,6 @@ class UserOperationLogSchema implements \JsonSerializable #[Property(property: 'updated_at', title: '更新时间', type: 'mixed')] public mixed $updatedAt; - #[Property(property: 'deleted_at', title: '删除时间', type: 'mixed')] - public mixed $deletedAt; - #[Property(property: 'remark', title: '备注', type: 'string')] public ?string $remark; @@ -83,12 +80,11 @@ public function __construct(UserOperationLog $model) $this->updatedBy = $model->updated_by; $this->createdAt = $model->created_at; $this->updatedAt = $model->updated_at; - $this->deletedAt = $model->deleted_at; $this->remark = $model->remark; } public function jsonSerialize(): mixed { - return ['id' => $this->id, 'username' => $this->username, 'method' => $this->method, 'router' => $this->router, 'service_name' => $this->serviceName, 'ip' => $this->ip, 'ip_location' => $this->ipLocation, 'request_data' => $this->requestData, 'response_code' => $this->responseCode, 'response_data' => $this->responseData, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'deleted_at' => $this->deletedAt, 'remark' => $this->remark]; + return ['id' => $this->id, 'username' => $this->username, 'method' => $this->method, 'router' => $this->router, 'service_name' => $this->serviceName, 'ip' => $this->ip, 'ip_location' => $this->ipLocation, 'request_data' => $this->requestData, 'response_code' => $this->responseCode, 'response_data' => $this->responseData, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; } } diff --git a/app/Schema/UserSchema.php b/app/Schema/UserSchema.php index 2facf03f..c51e5938 100644 --- a/app/Schema/UserSchema.php +++ b/app/Schema/UserSchema.php @@ -69,9 +69,6 @@ final class UserSchema implements \JsonSerializable #[Property(property: 'updated_at', title: '更新时间', type: 'string')] public mixed $updatedAt; - #[Property(property: 'deleted_at', title: '删除时间', type: 'string')] - public mixed $deletedAt; - #[Property(property: 'remark', title: '备注', type: 'string')] public ?string $remark; @@ -93,12 +90,11 @@ public function __construct(User $model) $this->updatedBy = $model->updated_by; $this->createdAt = $model->created_at; $this->updatedAt = $model->updated_at; - $this->deletedAt = $model->deleted_at; $this->remark = $model->remark; } public function jsonSerialize(): mixed { - return ['id' => $this->id, 'username' => $this->username, 'user_type' => $this->userType, 'nickname' => $this->nickname, 'phone' => $this->phone, 'email' => $this->email, 'avatar' => $this->avatar, 'signed' => $this->signed, 'status' => $this->status, 'login_ip' => $this->loginIp, 'login_time' => $this->loginTime, 'backend_setting' => $this->backendSetting, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'deleted_at' => $this->deletedAt, 'remark' => $this->remark]; + return ['id' => $this->id, 'username' => $this->username, 'user_type' => $this->userType, 'nickname' => $this->nickname, 'phone' => $this->phone, 'email' => $this->email, 'avatar' => $this->avatar, 'signed' => $this->signed, 'status' => $this->status, 'login_ip' => $this->loginIp, 'login_time' => $this->loginTime, 'backend_setting' => $this->backendSetting, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark]; } } diff --git a/storage/languages/en/user.php b/storage/languages/en/user.php index cdebbffc..9e1e85fc 100644 --- a/storage/languages/en/user.php +++ b/storage/languages/en/user.php @@ -27,7 +27,6 @@ 'updated_by ' => ' Updater ', 'created_at' => 'Creation time', 'updated_at ' => ' Update time ', - 'deleted_at' => 'Delete time', 'Remark ' => ' Remark ', 'username_exist' => 'Username already exists', 'Enums' => [ diff --git a/storage/languages/zh_CN/user.php b/storage/languages/zh_CN/user.php index 063b7965..7b9db612 100644 --- a/storage/languages/zh_CN/user.php +++ b/storage/languages/zh_CN/user.php @@ -27,7 +27,6 @@ 'updated_by' => '更新者', 'created_at' => '创建时间', 'updated_at' => '更新时间', - 'deleted_at' => '删除时间', 'remark' => '备注', 'username_exist' => '用户名已存在', 'enums' => [ diff --git a/storage/languages/zh_TW/user.php b/storage/languages/zh_TW/user.php index 27e5433c..2c986659 100644 --- a/storage/languages/zh_TW/user.php +++ b/storage/languages/zh_TW/user.php @@ -27,7 +27,6 @@ 'updated_by' => '更新者', 'created_at' => '創建時間', 'updated_at' => '更新時間', - 'deleted_at' => '刪除時間', 'remark' => '備註', 'username_exist' => '用戶名已存在', 'enums' => [ From 74d6ddb8b94949895a221edfecf66868696e021d Mon Sep 17 00:00:00 2001 From: zds <49744633+zds-s@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:03:51 +0800 Subject: [PATCH 2/3] Apply cs fix --- app/Model/Attachment.php | 4 ++-- app/Schema/AttachmentSchema.php | 2 +- app/Schema/RoleSchema.php | 2 +- app/Schema/UserOperationLogSchema.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Model/Attachment.php b/app/Model/Attachment.php index 2122e85d..3f77f119 100644 --- a/app/Model/Attachment.php +++ b/app/Model/Attachment.php @@ -43,10 +43,10 @@ final class Attachment extends MineModel /** * The attributes that are mass assignable. */ - protected array $fillable = ['id', 'storage_mode', 'origin_name', 'object_name', 'hash', 'mime_type', 'storage_path', 'suffix', 'size_byte', 'size_info', 'url', 'created_by', 'updated_by', 'created_at', 'updated_at','remark']; + protected array $fillable = ['id', 'storage_mode', 'origin_name', 'object_name', 'hash', 'mime_type', 'storage_path', 'suffix', 'size_byte', 'size_info', 'url', 'created_by', 'updated_by', 'created_at', 'updated_at', 'remark']; /** * The attributes that should be cast to native types. */ - protected array $casts = ['id' => 'integer', 'storage_mode' => 'integer', 'size_byte' => 'integer', 'created_by' => 'integer', 'updated_by' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime',]; + protected array $casts = ['id' => 'integer', 'storage_mode' => 'integer', 'size_byte' => 'integer', 'created_by' => 'integer', 'updated_by' => 'integer', 'created_at' => 'datetime', 'updated_at' => 'datetime']; } diff --git a/app/Schema/AttachmentSchema.php b/app/Schema/AttachmentSchema.php index 55dbb8b8..f76af206 100644 --- a/app/Schema/AttachmentSchema.php +++ b/app/Schema/AttachmentSchema.php @@ -89,6 +89,6 @@ public function __construct(Attachment $model) public function jsonSerialize(): mixed { - return ['id' => $this->id, 'storage_mode' => $this->storageMode, 'origin_name' => $this->originName, 'object_name' => $this->objectName, 'hash' => $this->hash, 'mime_type' => $this->mimeType, 'storage_path' => $this->storagePath, 'suffix' => $this->suffix, 'size_byte' => $this->sizeByte, 'size_info' => $this->sizeInfo, 'url' => $this->url, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; + return ['id' => $this->id, 'storage_mode' => $this->storageMode, 'origin_name' => $this->originName, 'object_name' => $this->objectName, 'hash' => $this->hash, 'mime_type' => $this->mimeType, 'storage_path' => $this->storagePath, 'suffix' => $this->suffix, 'size_byte' => $this->sizeByte, 'size_info' => $this->sizeInfo, 'url' => $this->url, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark]; } } diff --git a/app/Schema/RoleSchema.php b/app/Schema/RoleSchema.php index 6919bc80..c1ce4bad 100644 --- a/app/Schema/RoleSchema.php +++ b/app/Schema/RoleSchema.php @@ -70,6 +70,6 @@ public function __construct(Role $model) public function jsonSerialize(): mixed { - return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; + return ['id' => $this->id, 'name' => $this->name, 'code' => $this->code, 'data_scope' => $this->dataScope, 'status' => $this->status, 'sort' => $this->sort, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark]; } } diff --git a/app/Schema/UserOperationLogSchema.php b/app/Schema/UserOperationLogSchema.php index 0ad578a4..d00c20e3 100644 --- a/app/Schema/UserOperationLogSchema.php +++ b/app/Schema/UserOperationLogSchema.php @@ -85,6 +85,6 @@ public function __construct(UserOperationLog $model) public function jsonSerialize(): mixed { - return ['id' => $this->id, 'username' => $this->username, 'method' => $this->method, 'router' => $this->router, 'service_name' => $this->serviceName, 'ip' => $this->ip, 'ip_location' => $this->ipLocation, 'request_data' => $this->requestData, 'response_code' => $this->responseCode, 'response_data' => $this->responseData, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt,'remark' => $this->remark]; + return ['id' => $this->id, 'username' => $this->username, 'method' => $this->method, 'router' => $this->router, 'service_name' => $this->serviceName, 'ip' => $this->ip, 'ip_location' => $this->ipLocation, 'request_data' => $this->requestData, 'response_code' => $this->responseCode, 'response_data' => $this->responseData, 'created_by' => $this->createdBy, 'updated_by' => $this->updatedBy, 'created_at' => $this->createdAt, 'updated_at' => $this->updatedAt, 'remark' => $this->remark]; } } From 9c8db7d8dacd8223a926286027bb4c86c9e7f84b Mon Sep 17 00:00:00 2001 From: zds <49744633+zds-s@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:20:50 +0800 Subject: [PATCH 3/3] refactor(web): remove deleted_at field from log interface - Removed 'deleted_at' property from the log interface in TypeScript - Updated the PHP controller to reflect this change in the API response example --- app/Http/Admin/Controller/PermissionController.php | 2 +- web/src/modules/base/api/log.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Admin/Controller/PermissionController.php b/app/Http/Admin/Controller/PermissionController.php index 285a7606..a929a049 100644 --- a/app/Http/Admin/Controller/PermissionController.php +++ b/app/Http/Admin/Controller/PermissionController.php @@ -53,7 +53,7 @@ public function __construct( )] #[PageResponse( instance: MenuSchema::class, - example: '{"code":200,"message":"成功","data":[{"id":290,"parent_id":0,"name":"LAme6dFrlf","code":"eNiYagCtJp","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[{"id":291,"parent_id":290,"name":"zFFsqwN3rB","code":"isz4eTJANV","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":291,"parent_id":290,"name":"zFFsqwN3rB","code":"isz4eTJANV","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]},{"id":292,"parent_id":0,"name":"mMMSlHc8cv","code":"xzobstyEmP","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[{"id":293,"parent_id":292,"name":"8Sr5vtPSqw","code":"9SelwHGooE","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":293,"parent_id":292,"name":"8Sr5vtPSqw","code":"9SelwHGooE","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]},{"id":294,"parent_id":0,"name":"ot8fL3u7QZ","code":"kCbrLhgYDj","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[{"id":295,"parent_id":294,"name":"6uQFNiMzJa","code":"GVvC2iPU92","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":295,"parent_id":294,"name":"6uQFNiMzJa","code":"GVvC2iPU92","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]}' + example: '{"code":200,"message":"成功","data":[{"id":290,"parent_id":0,"name":"LAme6dFrlf","code":"eNiYagCtJp","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","remark":"test","children":[{"id":291,"parent_id":290,"name":"zFFsqwN3rB","code":"isz4eTJANV","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":291,"parent_id":290,"name":"zFFsqwN3rB","code":"isz4eTJANV","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]},{"id":292,"parent_id":0,"name":"mMMSlHc8cv","code":"xzobstyEmP","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[{"id":293,"parent_id":292,"name":"8Sr5vtPSqw","code":"9SelwHGooE","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":293,"parent_id":292,"name":"8Sr5vtPSqw","code":"9SelwHGooE","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]},{"id":294,"parent_id":0,"name":"ot8fL3u7QZ","code":"kCbrLhgYDj","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[{"id":295,"parent_id":294,"name":"6uQFNiMzJa","code":"GVvC2iPU92","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]},{"id":295,"parent_id":294,"name":"6uQFNiMzJa","code":"GVvC2iPU92","icon":"test","route":"test","component":"test","redirect":"test","is_hidden":1,"type":"M","status":1,"sort":1,"created_by":1,"updated_by":1,"created_at":"2024-08-02 00:32:26","updated_at":"2024-08-02 00:32:26","deleted_at":null,"remark":"test","children":[]}]}' )] public function menus(): Result { diff --git a/web/src/modules/base/api/log.ts b/web/src/modules/base/api/log.ts index b16c7440..44eaf9c0 100644 --- a/web/src/modules/base/api/log.ts +++ b/web/src/modules/base/api/log.ts @@ -37,7 +37,6 @@ export interface RequestLogInfoVo { ip: string created_at: string updated_at: string - deleted_at: string // 备注信息 remark: string }