修改

domain/repository/convert_reposity.go

@@ -58,6 +58,8 @@ type DoConversionRequest struct {
 	SourceURI    string
 	TargetURI    string
 	IsPrivate    bool
+	CallbackUrl  string
+	CallbackData string
 }
 
 type GetConversionResponse struct {

domain/service/convert_service.go

@@ -27,10 +27,10 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 		SourceURI:    req.SourceUrl,
 		TargetURI:    req.TargetUrl,
 		IsPrivate:    req.IsPrivate,
+		CallbackData: req.CallbackData,
+		CallbackUrl:  req.CallbackUrl,
 	}
 
-	request.IsPrivate = true
-
 	//创建项目
 	createErr := service.NewConversion().CreateProject()
 	fmt.Println(createErr)
@@ -41,6 +41,70 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 		return resp, err
 	}
 
+	//入库
+	save, errsInfo := db.GetServerSiteMicrosDB().DocServerProject.Create().
+		SetProjectName(req.ProjectName).
+		SetCreatedAt(time.Now()).
+		SetSourceURL(request.SourceURI).
+		SetSourceType(req.SourceType).
+		SetTargetURL(request.TargetURI).
+		Save(c)
+
+	if errsInfo != nil {
+		resp.Msg = errsInfo.Error()
+		resp.Code = 100010
+		resp.Data = nil
+		return resp, errsInfo
+	}
+
+	//添加回调
+	_, err = db.GetServerSiteMicrosDB().DocServerCallback.Create().
+		SetCreatedAt(time.Now()).
+		SetCallbackData(request.CallbackData).
+		SetCallbackURL(request.CallbackUrl).
+		SetStatus(0).
+		SetServerProjectID(save.ID).
+		Save(c)
+
+	if err != nil {
+		resp.Msg = err.Error()
+		resp.Code = 100010
+		resp.Data = nil
+		return resp, err
+	}
+
+	resp.Msg = "success"
+	resp.Code = 200
+	resp.Data = &pb.DoConversionData{
+		Id:     save.ID,
+		TaskId: "",
+	}
+	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
+	}
+
+	request := &service.DoConversionRequest{
+		ProjectName: ConversionInfo.ProjectName,
+		SourceType:  ConversionInfo.SourceType,
+		TargetType:  ConversionInfo.TargetType,
+		SourceURI:   *ConversionInfo.SourceURL,
+		TargetURI:   *ConversionInfo.TargetURL,
+		IsPrivate:   ConversionInfo.IsPrivate,
+	}
+
+	//创建项目
+	createErr := service.NewConversion().CreateProject()
+	if createErr != nil {
+		return false
+	}
+
 	//执行转换
 	result, errs := service.NewConversion().Conversion(request)
 	if errs != nil {

go.mod

@@ -81,7 +81,7 @@ require (
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/zclconf/go-cty v1.8.0 // indirect
-	gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913063110-b668f029e9c5 // indirect
+	gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913105216-6591457b3d19 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.24.0 // indirect

go.sum

@@ -564,6 +564,8 @@ gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913054214-762767e8ba9
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913054214-762767e8ba9e/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913063110-b668f029e9c5 h1:RjVYcLotQxjcBVm4eeA1HoQaCb1Xb9lGcRX/O3EgpyQ=
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913063110-b668f029e9c5/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913105216-6591457b3d19 h1:WQcvVIQC/9TgEfRn0Rtk4iu9LsykFCdzxSaBWDedsGg=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240913105216-6591457b3d19/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=