Merge branch 'feature-userinfo-daiyb' into dev

api/bundle/bundle.validator.pb.go

@@ -17,29 +17,6 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
-func (this *QueryTheOrderSnapshotInformationReq) Validate() error {
-	return nil
-}
-func (this *QueryTheOrderSnapshotInformationResp) Validate() error {
-	for _, item := range this.BundleOrder {
-		if item != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("BundleOrder", err)
-			}
-		}
-	}
-	for _, item := range this.AddBundleOrder {
-		if item != nil {
-			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
-				return github_com_mwitkow_go_proto_validators.FieldError("AddBundleOrder", err)
-			}
-		}
-	}
-	return nil
-}
-func (this *ServiceInformation) Validate() error {
-	return nil
-}
 func (this *DeleteValueAddServiceRequest) Validate() error {
 	return nil
 }

pkg/service/cast/media.go

@@ -38,6 +38,7 @@ func MediaUserList(ctx *gin.Context) {
 		return
 	}
 	var statResp *bundle.ArtistUploadStatsResponse
+	if req.NeedStats {
 		for _, v := range resp.Data {
 			statResp, err = service.BundleProvider.GetArtistUploadStatsList(context.Background(), &bundle.TaskQueryRequest{
 				Keyword:          v.ArtistPhone,
@@ -63,7 +64,7 @@ func MediaUserList(ctx *gin.Context) {
 				v.UploadedPostCount = info.UploadedPostCount
 				v.ReleasedPostTotal = info.ReleasedPostTotal
 			}
-
+		}
 	}
 	go func() {
 		for _, v := range resp.Data {

pkg/service/cast/work.go

@@ -1111,9 +1111,33 @@ func ImportWorkBatch(ctx *gin.Context) {
 		}
 		if len(row) > 5 {
 			temp.Title = utils.CleanString(row[5])
+			ok, _err := check.SecurityText(temp.Title)
+			if _err != nil {
+				temp.Remark = _err.Error()
+				req.ImageWorks = append(req.ImageWorks, temp)
+				break
+			}
+			if !ok {
+				temp.Remark = "标题黄反审核未通过"
+				req.ImageWorks = append(req.ImageWorks, temp)
+				break
+			}
 		}
 		if len(row) > 6 {
 			temp.Content = utils.CleanString(row[6])
+			if temp.Content != "" {
+				ok, _err := check.SecurityText(temp.Content)
+				if _err != nil {
+					temp.Remark = _err.Error()
+					req.ImageWorks = append(req.ImageWorks, temp)
+					break
+				}
+				if !ok {
+					temp.Remark = "内容黄反审核未通过"
+					req.ImageWorks = append(req.ImageWorks, temp)
+					break
+				}
+			}
 		}
 		// 图片
 		for i := 8; i <= 18; i++ {