Merge pull request 'hashcat' (#39) from zhangweiii/pcm-coordinator:v0.1.0-xjlab-alpha1 into v0.1.0-xjlab-alpha1

Former-commit-id: 84bf749acf0e04b737605860b35c499761dbab93

api/desc/core/pcm-core.api

@@ -565,11 +565,12 @@ type NodeAsset {
     ParticipantId int64 `json:"ParticipantId"`     // 集群动态信息id
 }
 
-type crackProgressReq {
+type crackProgressResp {
-    CrackTaskId string `form:"crackTaskId"`
+    crackProgressList []CrackProgress `json:"crackProgressList"`
 }
 
-type crackProgressResp {
+type CrackProgress {
+    Name string `json:"name"`
     Progress string `json:"progress"`
     Current string `json:"current"`
     Total string `json:"total"`

api/desc/pcm.api

@@ -119,7 +119,7 @@ service pcm {
 
 	@doc "Hashcat Crack Progress"
 	@handler crackProgressHandler
-	get /core/crack/progress (crackProgressReq) returns (crackProgressResp)
+	get /core/crack/progress  returns (crackProgressResp)
 
 	@doc "Resource Center Information"
 	@handler resourceCenterInfoHandler

api/internal/handler/core/crackprogresshandler.go

@@ -1,28 +1,17 @@
 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 CrackProgressHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types.CrackProgressReq
-		if err := httpx.Parse(r, &req); err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-			return
-		}
-
 		l := core.NewCrackProgressLogic(r.Context(), svcCtx)
-		resp, err := l.CrackProgress(&req)
+		resp, err := l.CrackProgress()
-		if err != nil {
+		result.HttpResult(r, w, resp, err)
-			httpx.ErrorCtx(r.Context(), w, err)
-		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
-		}
 	}
 }

api/internal/logic/core/crackprogresslogic.go

@@ -2,7 +2,6 @@ package core
 
 import (
 	"context"
-	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
 	"strings"
 
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
@@ -25,24 +24,29 @@ func NewCrackProgressLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cra
 	}
 }
 
-func (l *CrackProgressLogic) CrackProgress(req *types.CrackProgressReq) (resp *types.CrackProgressResp, err error) {
+func (l *CrackProgressLogic) CrackProgress() (resp *types.CrackProgressResp, err error) {
+	// todo: add your logic here and delete this line
 	result := types.CrackProgressResp{}
-	var hashcat *models.THashcat
+	var crackProgressList []*types.CrackProgress
-	tx := l.svcCtx.DbEngin.Where("crack_task_id = ?", req.CrackTaskId).Order("id desc").Limit(1).Find(&hashcat)
+	tx := l.svcCtx.DbEngin.Raw("SELECT h.id, h.speed, h.crack_progress as progress,c.`name`  \nFROM t_hashcat h  \nJOIN (  \n    SELECT crack_task_id, MAX(id) as max_id  \n    FROM t_hashcat  \n    GROUP BY crack_task_id  \n) AS sub_query ON h.crack_task_id = sub_query.crack_task_id AND h.id = sub_query.max_id  \nJOIN cloud c ON h.crack_task_id = c.`name`").Scan(&crackProgressList)
 	if tx.Error != nil {
 		return nil, tx.Error
 	}
-	if len(hashcat.Speed) != 0 {
+	for _, crackProgress := range crackProgressList {
-		str1 := strings.Split(hashcat.Speed, "@")
+		if len(crackProgress.Speed) != 0 {
-		result.Speed = str1[0]
+			str1 := strings.Split(crackProgress.Speed, "@")
-	}
+			crackProgress.Speed = str1[0]
-	if len(hashcat.CrackProgress) != 0 {
+		}
-		str1 := strings.Split(hashcat.CrackProgress, "/")
+		if len(crackProgress.Progress) != 0 {
-		result.Current = str1[0]
+			str1 := strings.Split(crackProgress.Progress, "/")
-		str2 := strings.Split(str1[1], " (")
+			crackProgress.Current = str1[0]
-		result.Total = str2[0]
+			str2 := strings.Split(str1[1], " (")
-		str3 := strings.Split(str2[1], "%")
+			crackProgress.Total = str2[0]
-		result.Progress = str3[0]
+			str3 := strings.Split(str2[1], "%")
+			crackProgress.Progress = str3[0]
+		}
+		result.CrackProgressList = append(result.CrackProgressList, *crackProgress)
 	}
+
 	return &result, nil
 }

api/internal/types/types.go

@@ -517,11 +517,12 @@ type NodeAsset struct {
 	ParticipantId int64   `json:"ParticipantId"` // 集群动态信息id
 }
 
-type CrackProgressReq struct {
+type CrackProgressResp struct {
-	CrackTaskId string `form:"crackTaskId"`
+	CrackProgressList []CrackProgress `json:"crackProgressList"`
 }
 
-type CrackProgressResp struct {
+type CrackProgress struct {
+	Name     string `json:"name"`
 	Progress string `json:"progress"`
 	Current  string `json:"current"`
 	Total    string `json:"total"`