修改

console/convert_command.go

@@ -71,6 +71,7 @@ func toDoData(c context.Context) int8 {
 	}
 
 	for _, item := range projectData {
+		//执行转换
 		ali := DoConversionToAli(c, item.ID)
 		if ali {
 			_, errUpdate := db.GetServerSiteMicrosDB().DocServerProject.UpdateOneID(item.ID).SetStatus(1).Save(c)
@@ -92,9 +93,9 @@ func DoConversionToAli(c context.Context, projectId int32) bool {
 	if infoErr != nil {
 		return false
 	}
-	IsPrivate := true
+	IsPrivate := false
 	if ConversionInfo.IsPrivate == 1 {
-		IsPrivate = false
+		IsPrivate = true
 	}
 
 	request := &service2.DoConversionRequest{

domain/service/convert_service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	service "doc-service/domain/repository"
 	"doc-service/infra/db"
+	"encoding/json"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
 	pb "gitlab.galaxy-immi.com/Backend-group/proto/pb/docservice"
 	"strings"
@@ -25,6 +26,11 @@ func recoverPanic() {
 func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversionRequest) (resp *pb.DoConversionResponse, err error) {
 	defer recoverPanic()
 	resp = &pb.DoConversionResponse{}
+	CallBackData := &pb.CallBackData{
+		Id: req.CallbackData.Id,
+	}
+
+	jsonCallBackData, _ := json.Marshal(CallBackData)
 	request := &service.DoConversionRequest{
 		ProjectName:  req.ProjectName,
 		SourceType:   req.SourceType,
@@ -32,7 +38,7 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 		SourceURI:    req.SourceUrl,
 		TargetURI:    req.TargetUrl,
 		IsPrivate:    req.IsPrivate,
-		CallbackData: req.CallbackData,
+		CallbackData: string(jsonCallBackData),
 		CallbackUrl:  req.CallbackUrl,
 	}
 
@@ -45,7 +51,7 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 		return resp, err
 	}
 
-	//入库
+	//入库 默认公有有库
 	isPri := 0
 	if req.IsPrivate {
 		isPri = 1

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/nacos-group/nacos-sdk-go/v2 v2.2.4
 	github.com/robfig/cron v1.2.0
 	gitlab.galaxy-immi.com/Backend-group/go-com v1.4.2-test-rc12
-	gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918032310-d804e767dd2c
+	gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918113320-a219a51d3141
 	go.uber.org/zap v1.21.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
 	google.golang.org/grpc v1.64.0

go.sum

@@ -554,6 +554,12 @@ gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240914031913-37c18f143a6
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240914031913-37c18f143a6d/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918032310-d804e767dd2c h1:oxGqTzwREd3VqEWW2sdZrRytUXAon4McO1n7xtBsk+o=
 gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918032310-d804e767dd2c/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918095351-4c83d1387443 h1:+A3YLf+cZwN//TYiyXq/Eg3ENcreWFuW+4yVO36QyXY=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918095351-4c83d1387443/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918112310-5bc55fd5ae98 h1:GevfB8xTJmKtS4+Gd55/mRWW9TzYwF6twF//f03QvLI=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918112310-5bc55fd5ae98/go.mod h1:vXZLtbzFvAjc86DXqO8LdYjBkMGc5fVh5XGe2bi4FqE=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918113320-a219a51d3141 h1:pWEKbayUSmeSrrxLfahEky3yujIgxPbc29E56cCkyO0=
+gitlab.galaxy-immi.com/Backend-group/proto v1.10.11-0.20240918113320-a219a51d3141/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=