修改

console/convert_command.go

@@ -119,14 +119,14 @@ func DoConversionToAli(c context.Context, projectId int32) (bool, error) {
 	}
 
 	//创建项目
-	createErr := service2.NewConversion().CreateProject(ConversionInfo.ProjectName)
+	createErr := service2.NewConversion(IsPrivate, *ConversionInfo.SourceURL).CreateProject(ConversionInfo.ProjectName)
 	if createErr != nil {
 		log.Info("创建项目出错" + createErr.Error())
 		return false, createErr
 	}
 
 	//执行转换
-	result, errs := service2.NewConversion().Conversion(request)
+	result, errs := service2.NewConversion(IsPrivate, *ConversionInfo.SourceURL).Conversion(request)
 	if errs != nil {
 		log.Info("转换出错" + errs.Error())
 		return false, errs

console/get_convert_command.go

@@ -95,7 +95,12 @@ func GetProjectInfo(c context.Context, projectId int32) (int8, string) {
 	//task_type和原始有区别，需要使用返回的task_id的首个元素
 	splitted := strings.Split(projectInfo.TaskID, "-")
 	request.TaskType = splitted[0]
-	result, errs := service.NewConversion().GetTaskProject(*request)
+
+	var isPrivate = true
+	if projectInfo.IsPrivate == 0 {
+		isPrivate = false
+	}
+	result, errs := service.NewConversion(isPrivate, *projectInfo.SourceURL).GetTaskProject(*request)
 	if errs != nil || *result.StatusCode != 200 || *result.Body.Status != "Succeeded" {
 		logger.Info(result)
 		logger.Error("错误信息" + errs.Error())

domain/repository/convert_reposity.go

@@ -42,7 +42,7 @@ type Conversion struct {
 }
 
 // 获取bucket信息
-func (o *Conversion) GetBucket(isPrivate bool, sourceURI string) string {
+func GetBucket(isPrivate bool, sourceURI string) string {
 	/*
 		ossBackName := "test-bucket-v1"
 		if !isPrivate {
@@ -112,22 +112,11 @@ func (o *Conversion) checkGetTaskParam(arg GetTaskRequest) error {
 	return nil
 }
 
-func NewConversion() *Conversion {
-	/*config, iniErr := ini.Load("domain/conf/app.ini")
-	if iniErr != nil {
-		fmt.Println("Fail to read file111")
-		log.Error("Fail to read file111 : %v")
-		os.Exit(1)
-	}
-	host := config.Section("AliYun").Key("host").String()
-	accessId := config.Section("AliYun").Key("accessId").String()
-	accessKeySecret := config.Section("AliYun").Key("accessKeySecret").String()
-	bucketPrivate := config.Section("AliYun").Key("bucketPrivate").String()*/
-
+func NewConversion(isPrivate bool, sourcetUrl string) *Conversion {
 	host := "imm.cn-shenzhen.aliyuncs.com"
 	accessId := "LTAI5tFsFNAoCngNdX9g4CMW"
 	accessKeySecret := "otz3kkD0s3SWhVitKP2cqiZdCkTCJd"
-	bucketPrivate := "test-bucket-v1"
+	bucketPrivate := GetBucket(isPrivate, sourcetUrl)
 	return &Conversion{
 		Endpoint:        host,
 		AccessKeyId:     accessId,
@@ -171,7 +160,7 @@ func (o *Conversion) Conversion(arg *DoConversionRequest) (map[string]interface{
 	if checkErr != nil {
 		return ret, checkErr
 	}
-	client := NewConversion()
+	client := NewConversion(arg.IsPrivate, arg.SourceURI)
 	params := client.CreateApiInfo()
 	sourceParseUrl, parseErr := url.Parse(arg.SourceURI)
 	if parseErr != nil {
@@ -185,8 +174,8 @@ func (o *Conversion) Conversion(arg *DoConversionRequest) (map[string]interface{
 	// query params
 	queries := map[string]interface{}{}
 	queries["ProjectName"] = arg.ProjectName
-	queries["SourceURI"] = o.GetBucket(arg.IsPrivate, arg.SourceURI) + sourceParseUrl.Path
-	queries["TargetURI"] = o.GetBucket(arg.IsPrivate, arg.SourceURI) + targetParseUrl.Path
+	queries["SourceURI"] = GetBucket(arg.IsPrivate, arg.SourceURI) + sourceParseUrl.Path
+	queries["TargetURI"] = GetBucket(arg.IsPrivate, arg.SourceURI) + targetParseUrl.Path
 	queries["SourceType"] = arg.SourceType
 	queries["TargetType"] = arg.TargetType
 	runtime := &util.RuntimeOptions{}
@@ -229,7 +218,6 @@ func (o *Conversion) CreateProject(projectName string) (_err error) {
 	}
 
 	createProjectRequest := &imm20200930.CreateProjectRequest{}
-	//ProjectName := "DOC_TO_PDF"
 	createProjectRequest.ProjectName = &projectName
 	runtime := &util.RuntimeOptions{}
 

domain/service/convert_service.go

@@ -118,14 +118,14 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 	}
 
 	//创建项目
-	createErr := service.NewConversion().CreateProject(req.ProjectName)
+	/*createErr := service.NewConversion(isPrivate, req.SourceUrl).CreateProject(req.ProjectName)
 	if createErr != nil {
 		resp.Msg = createErr.Error()
 		resp.Code = 10001
 		resp.Data = nil
 		return resp, err
 	}
-
+	*/
 	//入库 默认公有有库
 	isPri := 1
 	if !isPrivate {
@@ -215,7 +215,11 @@ func (doc *DocServiceService) GetProjectInfo(c context.Context, req *pb.GetProje
 	ConversionInfo.TaskId = projectInfo.TaskID
 	ConversionInfo.TargetType = projectInfo.TargetType
 
-	result, errs := service.NewConversion().GetTaskProject(*request)
+	var isPrivate = true
+	if projectInfo.IsPrivate == 0 {
+		isPrivate = false
+	}
+	result, errs := service.NewConversion(isPrivate, *projectInfo.SourceURL).GetTaskProject(*request)
 	//获取入库
 	CreateGetProject(c, request.ProjectId, *result.Body.Status)
 	if errs != nil || *result.StatusCode != 200 || *result.Body.Status != "Succeeded" {