diff --git a/api/admin/admin/admin/admin.go b/api/admin/admin/admin/admin.go index 5b088b0..0fc916b 100644 --- a/api/admin/admin/admin/admin.go +++ b/api/admin/admin/admin/admin.go @@ -5,13 +5,15 @@ import "github.com/gogf/gf/v2/frame/g" // AdminItem 管理员列表中的一行。 type AdminItem struct { - Id uint64 `json:"id"` - Username string `json:"username"` - Nickname string `json:"nickname"` - Status int `json:"status"` - RoleIds []uint64 `json:"roleIds"` - RoleNames []string `json:"roleNames"` - CreatedAt string `json:"createdAt"` + Id uint64 `json:"id"` + Username string `json:"username"` + Nickname string `json:"nickname"` + Status int `json:"status"` + BarkDeviceId string `json:"barkDeviceId"` + PushplusToken string `json:"pushplusToken"` + RoleIds []uint64 `json:"roleIds"` + RoleNames []string `json:"roleNames"` + CreatedAt string `json:"createdAt"` } // AdminListReq 分页查询管理员。 @@ -30,11 +32,13 @@ type AdminListRes struct { // AdminCreateReq 创建管理员。 type AdminCreateReq struct { - g.Meta `path:"/admin/create" method:"post" tags:"Admin/Admin" summary:"创建管理员"` - Username string `json:"username" v:"required"` - Password string `json:"password" v:"required|min-length:6#password required|password too short"` - Nickname string `json:"nickname"` - RoleIds []uint64 `json:"roleIds"` + g.Meta `path:"/admin/create" method:"post" tags:"Admin/Admin" summary:"创建管理员"` + Username string `json:"username" v:"required"` + Password string `json:"password" v:"required|min-length:6#password required|password too short"` + Nickname string `json:"nickname"` + BarkDeviceId string `json:"barkDeviceId"` + PushplusToken string `json:"pushplusToken"` + RoleIds []uint64 `json:"roleIds"` } // AdminCreateRes 是 AdminCreateReq 的响应。 @@ -44,11 +48,13 @@ type AdminCreateRes struct { // AdminUpdateReq 更新管理员的资料、状态与角色。 type AdminUpdateReq struct { - g.Meta `path:"/admin/update/{id}" method:"post" tags:"Admin/Admin" summary:"更新管理员"` - Id uint64 `json:"id" in:"path" v:"required"` - Nickname string `json:"nickname"` - Status int `json:"status"` - RoleIds []uint64 `json:"roleIds"` + g.Meta `path:"/admin/update/{id}" method:"post" tags:"Admin/Admin" summary:"更新管理员"` + Id uint64 `json:"id" in:"path" v:"required"` + Nickname string `json:"nickname"` + Status int `json:"status"` + BarkDeviceId string `json:"barkDeviceId"` + PushplusToken string `json:"pushplusToken"` + RoleIds []uint64 `json:"roleIds"` } // AdminUpdateRes 是 AdminUpdateReq 的响应。 diff --git a/api/job/v1/job.go b/api/job/job.go similarity index 99% rename from api/job/v1/job.go rename to api/job/job.go index 43553b4..3365416 100644 --- a/api/job/v1/job.go +++ b/api/job/job.go @@ -1,6 +1,6 @@ // Package job_v1 自动任务管理模块接口契约（DB 驱动的 gcron 调度 + 运行记录）。 // 规范（2026-08-27）：全部 POST；URL 不含参数；入参一律 body。 -package job_v1 +package job import "github.com/gogf/gf/v2/frame/g" diff --git a/api/notice/v1/notice.go b/api/notice/notice.go similarity index 99% rename from api/notice/v1/notice.go rename to api/notice/notice.go index a64e062..7174afe 100644 --- a/api/notice/v1/notice.go +++ b/api/notice/notice.go @@ -1,6 +1,6 @@ // Package notice_v1 通知模块接口契约（统一推送管理：渠道/规则/日志/测试）。 // 规范（2026-08-27）：全部 POST；URL 不含参数；入参一律 body。 -package notice_v1 +package notice import "github.com/gogf/gf/v2/frame/g" diff --git a/api/recruitment/v1/recruitment.go b/api/recruitment/recruitment.go similarity index 99% rename from api/recruitment/v1/recruitment.go rename to api/recruitment/recruitment.go index da2a156..b560447 100644 --- a/api/recruitment/v1/recruitment.go +++ b/api/recruitment/recruitment.go @@ -1,6 +1,6 @@ // Package recruitment_v1 招聘考试聚合模块接口契约。 // 规范（2026-08-27）：全部 POST；URL 不含任何参数（查询/路径参数均禁止）；入参一律走 body。 -package recruitment_v1 +package recruitment import "github.com/gogf/gf/v2/frame/g" diff --git a/api/serversecurity/v1/security.go b/api/serversecurity/security.go similarity index 99% rename from api/serversecurity/v1/security.go rename to api/serversecurity/security.go index c62ab86..048e0f3 100644 --- a/api/serversecurity/v1/security.go +++ b/api/serversecurity/security.go @@ -1,6 +1,6 @@ // Package serversecurity_v1 服务器安全监控日志模块接口契约。 // 规范（2026-08-27）：全部 POST；URL 不含任何参数（查询/路径参数均禁止）；入参一律走 body。 -package serversecurity_v1 +package serversecurity import "github.com/gogf/gf/v2/frame/g" diff --git a/internal/controller/job/job.go b/internal/controller/job/job.go index b7abd16..77ab905 100644 --- a/internal/controller/job/job.go +++ b/internal/controller/job/job.go @@ -4,7 +4,7 @@ package job import ( "context" - jobv1 "service.xpcool.com/api/job/v1" + jobv1 "service.xpcool.com/api/job" "service.xpcool.com/internal/model/dto" "service.xpcool.com/internal/service/job" ) diff --git a/internal/controller/notice/notice.go b/internal/controller/notice/notice.go index 6209cb7..6b51ad0 100644 --- a/internal/controller/notice/notice.go +++ b/internal/controller/notice/notice.go @@ -4,7 +4,7 @@ package notice import ( "context" - noticev1 "service.xpcool.com/api/notice/v1" + noticev1 "service.xpcool.com/api/notice" "service.xpcool.com/internal/model/dto" "service.xpcool.com/internal/service/notice" ) diff --git a/internal/controller/recruitment/recruitment.go b/internal/controller/recruitment/recruitment.go index e4cf388..aa07f80 100644 --- a/internal/controller/recruitment/recruitment.go +++ b/internal/controller/recruitment/recruitment.go @@ -3,7 +3,7 @@ package recruitment import ( "context" - recruitmentv1 "service.xpcool.com/api/recruitment/v1" + recruitmentv1 "service.xpcool.com/api/recruitment" "service.xpcool.com/internal/model/dto" "service.xpcool.com/internal/service/recruitment" ) diff --git a/internal/controller/serversecurity/controller.go b/internal/controller/serversecurity/controller.go index 5381a1a..209eb38 100644 --- a/internal/controller/serversecurity/controller.go +++ b/internal/controller/serversecurity/controller.go @@ -4,7 +4,7 @@ package serversecurity import ( - serversecurityv1 "service.xpcool.com/api/serversecurity/v1" + serversecurityv1 "service.xpcool.com/api/serversecurity" "service.xpcool.com/internal/model/dto" ) diff --git a/internal/controller/serversecurity/manage.go b/internal/controller/serversecurity/manage.go index 5dc849d..fbc1b19 100644 --- a/internal/controller/serversecurity/manage.go +++ b/internal/controller/serversecurity/manage.go @@ -4,7 +4,7 @@ package serversecurity import ( "context" - serversecurityv1 "service.xpcool.com/api/serversecurity/v1" + serversecurityv1 "service.xpcool.com/api/serversecurity" "service.xpcool.com/internal/model/dto" "service.xpcool.com/internal/service/serversecurity" ) diff --git a/internal/controller/serversecurity/report.go b/internal/controller/serversecurity/report.go index 690816a..2596b92 100644 --- a/internal/controller/serversecurity/report.go +++ b/internal/controller/serversecurity/report.go @@ -4,7 +4,7 @@ package serversecurity import ( "context" - serversecurityv1 "service.xpcool.com/api/serversecurity/v1" + serversecurityv1 "service.xpcool.com/api/serversecurity" "service.xpcool.com/internal/service/serversecurity" ) diff --git a/service_test2.exe b/service_test2.exe new file mode 100644 index 0000000..0fd9585 Binary files /dev/null and b/service_test2.exe differ diff --git a/service_test2.exe~ b/service_test2.exe~ new file mode 100644 index 0000000..ec7dac6 Binary files /dev/null and b/service_test2.exe~ differ