fix: 修复安全巡检valid失效的问题

services/rule_service.go

@@ -106,6 +106,7 @@ func (s *ruleService) ValidRule(ctx iris.Context) (viewmodels.ValidField, error)
 			return safeVaild, err
 		}
 		err = safeVaild.Validate()
+		return safeVaild, err
 	}
 
 	if ctx.Method() == "POST" {
@@ -119,16 +120,8 @@ func (s *ruleService) ValidRule(ctx iris.Context) (viewmodels.ValidField, error)
 		} else {
 			err = safeVaild.Validate()
 		}
-	}
 
-	// if ctx.Method() == "PUT" {
-	// 	err := ctx.ReadForm(&safeVaild)
-	// 	if err != nil {
-	// 		log.Println("safe-ValidRule-ReadForm转换异常, error=", err)
-	// 		return safeVaild, err
-	// 	}
-	// 	err = safeVaild.ValidateDelete()
-	// }
+	}
 	return safeVaild, nil
 
 }

services/safe_service.go

@@ -45,7 +45,6 @@ func NewSafeService() SafeService {
 }
 func (s *safeService) Get(id int, pid int) []viewmodels.SafeList {
 	datalist := s.daoSafe.GetListByBid(id)
-	fmt.Println(datalist)
 	safeList := make([]viewmodels.SafeList, 0)
 	for _, item := range datalist {
 		safeVM := viewmodels.SafeList{}
@@ -63,7 +62,6 @@ func (s *safeService) Get(id int, pid int) []viewmodels.SafeList {
 		safeVM.FileCounts = s.daoSafeFile.GetCount(item.Id)
 		safeList = append(safeList, safeVM)
 	}
-	fmt.Println("safeList", safeList)
 	return safeList
 }
 
@@ -114,6 +112,7 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 
 func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 	safeVaild := viewmodels.Safe{}
+	fmt.Println("---------------------------safeVaild", safeVaild)
 	if ctx.Method() == "GET" {
 		err := ctx.ReadForm(&safeVaild)
 		if err != nil {
@@ -126,6 +125,7 @@ func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 		} else {
 			err = safeVaild.ValidateList()
 		}
+		return safeVaild, err
 	}
 
 	if ctx.Method() == "POST" {
@@ -134,7 +134,9 @@ func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 			log.Println("safe-ValidRule-ReadJson转换异常, error=", err)
 			return safeVaild, err
 		}
+		fmt.Println("-------------------------------------")
 		err = safeVaild.ValidateCreate()
+		return safeVaild, err
 	}
 
 	if ctx.Method() == "PUT" {
@@ -144,6 +146,7 @@ func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 			return safeVaild, err
 		}
 		err = safeVaild.ValidateDelete()
+		return safeVaild, err
 	}
 	return safeVaild, nil
 

web/api/safe_api.go

@@ -39,7 +39,7 @@ func (c *SafeApi) Get() {
 	// 1.规则验证
 	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
 	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}
 	pid, err := utils.GetProjectId(c.Ctx)
@@ -79,8 +79,9 @@ func (c *SafeApi) Get() {
 func (c *SafeApi) Post() {
 	// 1.规则验证
 	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
+	fmt.Println("-------------------------------", err)
 	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}
 	bidsectionId, err := utils.GetDecryptId(safeData.BidsectionId)
@@ -103,13 +104,13 @@ func (c *SafeApi) Post() {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "日期转换异常,请检查参数"})
 		return
 	}
-	fmt.Println(createTime)
+	// fmt.Println(createTime)
 	data.CreateTime = createTime
-	err1 := c.ServiceSafe.Post(data)
+	err = c.ServiceSafe.Post(data)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{
 			"code": -1,
-			"msg":  err1,
+			"msg":  fmt.Sprintf("%s", err),
 		})
 		return
 	}
@@ -141,11 +142,11 @@ func (c *SafeApi) Delete() {
 		return
 	}
 
-	err1 := c.ServiceSafe.Del(id)
-	if err1 != nil {
+	err = c.ServiceSafe.Del(id)
+	if err != nil {
 		c.Ctx.JSON(iris.Map{
 			"code": -1,
-			"msg":  err1,
+			"msg":  fmt.Sprintf("%s", err),
 		})
 		return
 	}
@@ -169,7 +170,7 @@ func (c *SafeApi) GetDetail() {
 	// 1.规则验证
 	safeData, err := c.ServiceSafe.ValidRule(c.Ctx)
 	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}