From 25ebbd510b0b7b033dd3dad2088a80c4c36bb74d Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Mon, 5 Feb 2024 10:27:30 +0800 Subject: [PATCH 1/2] Remove the useless code Former-commit-id: 9c7a158e345649b861542025738fb5999f30a59e --- api/desc/core/pcm-core.api | 58 ------------------- api/desc/pcm.api | 8 --- .../handler/core/gethashcathandler.go | 39 ------------- .../handler/core/savehashcathandler.go | 39 ------------- api/internal/handler/routes.go | 10 ---- api/internal/logic/core/gethashcatlogic.go | 50 ---------------- api/internal/logic/core/savehashcatlogic.go | 49 ---------------- api/internal/types/types.go | 58 ------------------- pkg/models/thashcat.go | 50 ---------------- 9 files changed, 361 deletions(-) delete mode 100644 api/internal/handler/core/gethashcathandler.go delete mode 100644 api/internal/handler/core/savehashcathandler.go delete mode 100644 api/internal/logic/core/gethashcatlogic.go delete mode 100644 api/internal/logic/core/savehashcatlogic.go delete mode 100644 pkg/models/thashcat.go diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 3aa75ddc..cb331e3d 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -591,64 +591,6 @@ type NodeAsset { ParticipantId int64 `json:"ParticipantId"` // 集群动态信息id } -type SaveHashcatReq { - CrackTaskId string `json:"crackTaskId"` // 任务id - CrackContainerId string `json:"crackContainerId"` // 容器id - CrackStatus string `json:"crackStatus"` // 状态 - CrackStartTime string `json:"crackStartTime"` //开始时间 - CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 - CrackProgress string `json:"crackProgress"` // 进度 - CrackResult string `json:"crackResult"` // 结果 - Started string `json:"started"` // 开始时间 - Stopped string `json:"stopped"` // 结束时间 - KernelFeature string `json:"kernelFeature"` - HashMode string `json:"hashMode"` - Rejected string `json:"rejected"` - Session string `json:"session"` - HashTarget string `json:"hashTarget"` - Speed string `json:"speed"` - Candidates string `json:"candidates"` - RestorePoint string `json:"restorePoint"` - Recovered string `json:"recovered"` - GuessQueue string `json:"guessQueue"` - CandidateEngine string `json:"candidateEngine"` - GuessMask string `json:"guessMask"` - RestoreSub string `json:"restoreSub"` -} - -type getHashcatHandlerReq { - CrackTaskId string `path:"crackTaskId"` // 任务id -} - -type getHashcatHandlerResp { - HashCatList []HashCat `json:"hashCatList"` -} - -type HashCat { - CrackTaskId string `json:"crackTaskId"` // 任务id - CrackContainerId string `json:"crackContainerId"` // 容器id - CrackStatus string `json:"crackStatus"` // 状态 - CrackStartTime string `json:"crackStartTime"` //开始时间 - CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 - CrackProgress string `json:"crackProgress"` // 进度 - CrackResult string `json:"crackResult"` // 结果 - Started string `json:"started"` // 开始时间 - Stopped string `json:"stopped"` // 结束时间 - KernelFeature string `json:"kernelFeature"` - HashMode string `json:"hashMode"` - Rejected string `json:"rejected"` - Session string `json:"session"` - HashTarget string `json:"hashTarget"` - Speed string `json:"speed"` - Candidates string `json:"candidates"` - RestorePoint string `json:"restorePoint"` - Recovered string `json:"recovered"` - GuessQueue string `json:"guessQueue"` - CandidateEngine string `json:"candidateEngine"` - GuessMask string `json:"guessMask"` - RestoreSub string `json:"restoreSub"` -} - type participantListResp { Participants []Participant `json:"participants"` } diff --git a/api/desc/pcm.api b/api/desc/pcm.api index b5f37900..2b3685d7 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -108,14 +108,6 @@ service pcm { @handler nodeAssetsHandler get /core/assets returns (NodeAssetsResp) - @doc "保存hashcat" - @handler saveHashcatHandler - post /core/saveHashcat (SaveHashcatReq) - - @doc "获取hashcat" - @handler getHashcatHandler - get /core/getHashcat/:crackTaskId (getHashcatHandlerReq) returns (getHashcatHandlerResp) - @doc "Center Resources top3" @handler centerResourcesHandler get /core/centerResources returns (centerResourcesResp) diff --git a/api/internal/handler/core/gethashcathandler.go b/api/internal/handler/core/gethashcathandler.go deleted file mode 100644 index af572771..00000000 --- a/api/internal/handler/core/gethashcathandler.go +++ /dev/null @@ -1,39 +0,0 @@ -/* - - Copyright (c) [2023] [pcm] - [pcm-coordinator] is licensed under Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPaRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. - -*/ - -package core - -import ( - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result" - "net/http" - - "github.com/zeromicro/go-zero/rest/httpx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" -) - -func GetHashcatHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - var req types.GetHashcatHandlerReq - if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) - return - } - - l := core.NewGetHashcatLogic(r.Context(), svcCtx) - resp, err := l.GetHashcat(&req) - result.HttpResult(r, w, resp, err) - } -} diff --git a/api/internal/handler/core/savehashcathandler.go b/api/internal/handler/core/savehashcathandler.go deleted file mode 100644 index 2c5b1d5e..00000000 --- a/api/internal/handler/core/savehashcathandler.go +++ /dev/null @@ -1,39 +0,0 @@ -/* - - Copyright (c) [2023] [pcm] - [pcm-coordinator] is licensed under Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPaRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. - -*/ - -package core - -import ( - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result" - "net/http" - - "github.com/zeromicro/go-zero/rest/httpx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/logic/core" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" -) - -func SaveHashcatHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - var req types.SaveHashcatReq - if err := httpx.Parse(r, &req); err != nil { - httpx.ErrorCtx(r.Context(), w, err) - return - } - - l := core.NewSaveHashcatLogic(r.Context(), svcCtx) - err := l.SaveHashcat(&req) - result.HttpResult(r, w, nil, err) - } -} diff --git a/api/internal/handler/routes.go b/api/internal/handler/routes.go index 3a772257..fb8d9008 100644 --- a/api/internal/handler/routes.go +++ b/api/internal/handler/routes.go @@ -126,16 +126,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/core/assets", Handler: core.NodeAssetsHandler(serverCtx), }, - { - Method: http.MethodPost, - Path: "/core/saveHashcat", - Handler: core.SaveHashcatHandler(serverCtx), - }, - { - Method: http.MethodGet, - Path: "/core/getHashcat/:crackTaskId", - Handler: core.GetHashcatHandler(serverCtx), - }, { Method: http.MethodGet, Path: "/core/centerResources", diff --git a/api/internal/logic/core/gethashcatlogic.go b/api/internal/logic/core/gethashcatlogic.go deleted file mode 100644 index d40dcb6b..00000000 --- a/api/internal/logic/core/gethashcatlogic.go +++ /dev/null @@ -1,50 +0,0 @@ -/* - - Copyright (c) [2023] [pcm] - [pcm-coordinator] is licensed under Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPaRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. - -*/ - -package core - -import ( - "context" - "github.com/zeromicro/go-zero/core/logx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" -) - -type GetHashcatLogic struct { - logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext -} - -func NewGetHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetHashcatLogic { - return &GetHashcatLogic{ - Logger: logx.WithContext(ctx), - ctx: ctx, - svcCtx: svcCtx, - } -} - -func (l *GetHashcatLogic) GetHashcat(req *types.GetHashcatHandlerReq) (resp *types.GetHashcatHandlerResp, err error) { - // todo: add your logic here and delete this line - var hashcatList []*models.THashcat - tx := l.svcCtx.DbEngin.Where("crack_task_id = ?", req.CrackTaskId).Find(&hashcatList) - if tx.Error != nil { - return nil, tx.Error - } - result := types.GetHashcatHandlerResp{} - utils.Convert(hashcatList, &result.HashCatList) - return &result, nil -} diff --git a/api/internal/logic/core/savehashcatlogic.go b/api/internal/logic/core/savehashcatlogic.go deleted file mode 100644 index 738ef371..00000000 --- a/api/internal/logic/core/savehashcatlogic.go +++ /dev/null @@ -1,49 +0,0 @@ -/* - - Copyright (c) [2023] [pcm] - [pcm-coordinator] is licensed under Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPaRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. - -*/ - -package core - -import ( - "context" - "github.com/zeromicro/go-zero/core/logx" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/types" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models" - "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" -) - -type SaveHashcatLogic struct { - logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext -} - -func NewSaveHashcatLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SaveHashcatLogic { - return &SaveHashcatLogic{ - Logger: logx.WithContext(ctx), - ctx: ctx, - svcCtx: svcCtx, - } -} - -func (l *SaveHashcatLogic) SaveHashcat(req *types.SaveHashcatReq) error { - var hashcat models.THashcat - utils.Convert(req, &hashcat) - hashcat.Id = utils.GenSnowflakeID() - tx := l.svcCtx.DbEngin.Save(hashcat) - if tx.Error != nil { - return tx.Error - } - return nil -} diff --git a/api/internal/types/types.go b/api/internal/types/types.go index f06e315e..0cbb3ad0 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -557,64 +557,6 @@ type NodeAsset struct { ParticipantId int64 `json:"ParticipantId"` // 集群动态信息id } -type SaveHashcatReq struct { - CrackTaskId string `json:"crackTaskId"` // 任务id - CrackContainerId string `json:"crackContainerId"` // 容器id - CrackStatus string `json:"crackStatus"` // 状态 - CrackStartTime string `json:"crackStartTime"` //开始时间 - CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 - CrackProgress string `json:"crackProgress"` // 进度 - CrackResult string `json:"crackResult"` // 结果 - Started string `json:"started"` // 开始时间 - Stopped string `json:"stopped"` // 结束时间 - KernelFeature string `json:"kernelFeature"` - HashMode string `json:"hashMode"` - Rejected string `json:"rejected"` - Session string `json:"session"` - HashTarget string `json:"hashTarget"` - Speed string `json:"speed"` - Candidates string `json:"candidates"` - RestorePoint string `json:"restorePoint"` - Recovered string `json:"recovered"` - GuessQueue string `json:"guessQueue"` - CandidateEngine string `json:"candidateEngine"` - GuessMask string `json:"guessMask"` - RestoreSub string `json:"restoreSub"` -} - -type GetHashcatHandlerReq struct { - CrackTaskId string `path:"crackTaskId"` // 任务id -} - -type GetHashcatHandlerResp struct { - HashCatList []HashCat `json:"hashCatList"` -} - -type HashCat struct { - CrackTaskId string `json:"crackTaskId"` // 任务id - CrackContainerId string `json:"crackContainerId"` // 容器id - CrackStatus string `json:"crackStatus"` // 状态 - CrackStartTime string `json:"crackStartTime"` //开始时间 - CrackEstimatedTime string `json:"crackEstimatedTime"` // 预计时间 - CrackProgress string `json:"crackProgress"` // 进度 - CrackResult string `json:"crackResult"` // 结果 - Started string `json:"started"` // 开始时间 - Stopped string `json:"stopped"` // 结束时间 - KernelFeature string `json:"kernelFeature"` - HashMode string `json:"hashMode"` - Rejected string `json:"rejected"` - Session string `json:"session"` - HashTarget string `json:"hashTarget"` - Speed string `json:"speed"` - Candidates string `json:"candidates"` - RestorePoint string `json:"restorePoint"` - Recovered string `json:"recovered"` - GuessQueue string `json:"guessQueue"` - CandidateEngine string `json:"candidateEngine"` - GuessMask string `json:"guessMask"` - RestoreSub string `json:"restoreSub"` -} - type ParticipantListResp struct { Participants []Participant `json:"participants"` } diff --git a/pkg/models/thashcat.go b/pkg/models/thashcat.go deleted file mode 100644 index ce3f4944..00000000 --- a/pkg/models/thashcat.go +++ /dev/null @@ -1,50 +0,0 @@ -// Code generated by goctl. DO NOT EDIT. - -package models - -import ( - "github.com/zeromicro/go-zero/core/stores/sqlx" -) - -type ( - defaultTHashcatModel struct { - conn sqlx.SqlConn - table string - } - - THashcat struct { - Id int64 `db:"id"` // id - CrackTaskId string `db:"crack_task_id"` // 任务id - CrackContainerId string `db:"container_id"` // 任务id - CrackStatus string `db:"crack_status"` // 状态 - CrackStartTime string `db:"crack_start_time"` //开始时间 - CrackEstimatedTime string `db:"crack_estimated_time"` // 预计时间 - CrackProgress string `db:"crack_progress"` // 进度 - CrackResult string `db:"crack_result"` // 结果 - Started string `db:"started"` // 开始时间 - Stopped string `db:"stopped"` // 结束时间 - CreatedBy int64 `db:"created_by"` // 创建人 - UpdatedBy int64 `db:"updated_by"` // 更新人 - DeletedFlag int64 `db:"deleted_flag"` // 是否删除（0-否，1-是） - KernelFeature string `db:"kernel_feature"` - HashMode string `db:"hash_mode"` - Rejected string `db:"rejected"` - Session string `db:"session"` - HashTarget string `db:"hash_target"` - Speed string `db:"speed"` - Candidates string `db:"candidates"` - RestorePoint string `db:"restore_point"` - Recovered string `db:"recovered"` - GuessQueue string `db:"guess_queue"` - CandidateEngine string `db:"candidate_engine"` - GuessMask string `db:"guess_mask"` - RestoreSub string `db:"restore_sub"` - } -) - -func newTHashcatModel(conn sqlx.SqlConn) *defaultCloudModel { - return &defaultCloudModel{ - conn: conn, - table: "`cloud`", - } -} From a616e914c6a1c817efc9308d5c4a881fb8601b13 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Mon, 5 Feb 2024 11:56:27 +0800 Subject: [PATCH 2/2] Remove the useless code Former-commit-id: eebee72d1c53bfc1080dd9e433012bc680bca676 --- api/desc/core/pcm-core.api | 7 ------- api/internal/types/types.go | 8 -------- 2 files changed, 15 deletions(-) diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index de86c2b9..a1aebb3b 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -172,13 +172,6 @@ type ( getClusterListResp { clusters []ClusterInfo `json:"clusters"` } - ClusterInfo { - Id int64 `json:"id"` - Name string `json:"name"` - Address string `json:"address"` - Token string `json:"token"` - MetricsUrl string `json:"metricsUrl"` - } ) type ( diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 90b04977..19e46e4e 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -157,14 +157,6 @@ type GetClusterListResp struct { Clusters []ClusterInfo `json:"clusters"` } -type ClusterInfo struct { - Id int64 `json:"id"` - Name string `json:"name"` - Address string `json:"address"` - Token string `json:"token"` - MetricsUrl string `json:"metricsUrl"` -} - type ListRegionResp struct { Code int32 `json:"code"` Msg string `json:"msg"`