修改

console/convert_command.go

@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"context"
 	"doc-service/domain/entity/serversitemicros/docserverproject"
-	"doc-service/domain/service"
+	service2 "doc-service/domain/repository"
 	"doc-service/infra/db"
 	"fmt"
 	"gitlab.galaxy-immi.com/Backend-group/go-com/third/log"
@@ -15,7 +15,6 @@ import (
 
 func DoAliData() {
 	fmt.Println("开始刷新请求...")
-
 	ctx := context.Background()
 	// 启动一个协程来执行定时任务 20秒一次
 	ticker := time.NewTicker(5 * time.Second)
@@ -62,8 +61,7 @@ func toDoData(c context.Context) int8 {
 	}
 
 	for _, item := range projectData {
-		docService := &service.DocServiceService{}
-		ali := docService.DoConversionToAli(c, item.ID)
+		ali := DoConversionToAli(c, item.ID)
 		if ali {
 			_, errUpdate := db.GetServerSiteMicrosDB().DocServerProject.UpdateOneID(item.ID).SetStatus(1).Save(c)
 			if errUpdate != nil {
@@ -76,3 +74,46 @@ func toDoData(c context.Context) int8 {
 	}
 	return 1
 }
+
+// 执行文件转换（脚本使用）
+func DoConversionToAli(c context.Context, projectId int32) bool {
+	ConversionInfo, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, projectId)
+	if infoErr != nil {
+		return false
+	}
+	IsPrivate := true
+	if ConversionInfo.IsPrivate == 0 {
+		IsPrivate = false
+	}
+
+	request := &service2.DoConversionRequest{
+		ProjectName: ConversionInfo.ProjectName,
+		SourceType:  ConversionInfo.SourceType,
+		TargetType:  ConversionInfo.TargetType,
+		SourceURI:   *ConversionInfo.SourceURL,
+		TargetURI:   *ConversionInfo.TargetURL,
+		IsPrivate:   IsPrivate,
+	}
+
+	//创建项目
+	createErr := service2.NewConversion().CreateProject()
+	if createErr != nil {
+		log.Info("创建项目出错" + createErr.Error())
+		return false
+	}
+
+	//执行转换
+	result, errs := service2.NewConversion().Conversion(request)
+	if errs != nil {
+		log.Info("转换出错" + errs.Error())
+		return false
+	}
+	taskId := result["body"].(map[string]interface{})["TaskId"].(string)
+	//修改taskId
+	_, errsInfo := db.GetServerSiteMicrosDB().DocServerProject.UpdateOneID(projectId).SetTaskID(taskId).Save(c)
+	if errsInfo != nil {
+		log.Info("入库出错" + errsInfo.Error())
+		return false
+	}
+	return true
+}

domain/service/convert_service.go

@@ -6,7 +6,6 @@ import (
 	service "doc-service/domain/repository"
 	"doc-service/infra/db"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
-	"gitlab.galaxy-immi.com/Backend-group/go-com/third/log"
 	pb "gitlab.galaxy-immi.com/Backend-group/proto/pb/docservice"
 	"time"
 )
@@ -88,49 +87,6 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 	return resp, nil
 }
 
-// 执行文件转换（脚本使用）
-func (doc *DocServiceService) DoConversionToAli(c context.Context, projectId int32) bool {
-	ConversionInfo, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, projectId)
-	if infoErr != nil {
-		return false
-	}
-	IsPrivate := true
-	if ConversionInfo.IsPrivate == 0 {
-		IsPrivate = false
-	}
-
-	request := &service.DoConversionRequest{
-		ProjectName: ConversionInfo.ProjectName,
-		SourceType:  ConversionInfo.SourceType,
-		TargetType:  ConversionInfo.TargetType,
-		SourceURI:   *ConversionInfo.SourceURL,
-		TargetURI:   *ConversionInfo.TargetURL,
-		IsPrivate:   IsPrivate,
-	}
-
-	//创建项目
-	createErr := service.NewConversion().CreateProject()
-	if createErr != nil {
-		log.Info("创建项目出错" + createErr.Error())
-		return false
-	}
-
-	//执行转换
-	result, errs := service.NewConversion().Conversion(request)
-	if errs != nil {
-		log.Info("转换出错" + errs.Error())
-		return false
-	}
-	taskId := result["body"].(map[string]interface{})["TaskId"].(string)
-	//入库
-	_, errsInfo := db.GetServerSiteMicrosDB().DocServerProject.UpdateOneID(projectId).SetTaskID(taskId).Save(c)
-	if errsInfo != nil {
-		log.Info("入库出错" + errsInfo.Error())
-		return false
-	}
-	return true
-}
-
 // 获取转换结果
 func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProjectRequest) (resp *pb.GetProjectResponse, err error) {
 	resp = &pb.GetProjectResponse{}