修改

console/convert_command.go

@@ -73,26 +73,29 @@ 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)
-			if errUpdate != nil {
-				log.Info("修改状态出错" + errUpdate.Error())
-				continue
-			}
+		ali, msgError := DoConversionToAli(c, item.ID)
+		fmt.Printf("脚本请求阿里文件转换完成:   %d\n", item.ID)
+		var statusVal int32 = 1
+		if ali == false {
+			statusVal = 5
+		}
+		_, errUpdate := db.GetServerSiteMicrosDB().DocServerProject.UpdateOneID(item.ID).SetStatus(statusVal).SetCallbackRes(msgError.Error()).Save(c)
+		if errUpdate != nil {
+			log.Info("修改状态出错" + errUpdate.Error())
+			continue
 		}
 		log.Info("脚本请求阿里文件转换完成: " + string(item.ID))
-		fmt.Printf("脚本请求阿里文件转换完成:   %d\n", item.ID)
+
 	}
 	return 1
 }
 
 // 执行文件转换（脚本使用）
-func DoConversionToAli(c context.Context, projectId int32) bool {
+func DoConversionToAli(c context.Context, projectId int32) (bool, error) {
 	defer recoverPanicToPro()
 	ConversionInfo, infoErr := db.GetServerSiteMicrosDB().DocServerProject.Get(c, projectId)
 	if infoErr != nil {
-		return false
+		return false, infoErr
 	}
 	IsPrivate := false
 	if ConversionInfo.IsPrivate == 1 {
@@ -109,24 +112,24 @@ func DoConversionToAli(c context.Context, projectId int32) bool {
 	}
 
 	//创建项目
-	createErr := service2.NewConversion().CreateProject()
+	createErr := service2.NewConversion().CreateProject(ConversionInfo.ProjectName)
 	if createErr != nil {
 		log.Info("创建项目出错" + createErr.Error())
-		return false
+		return false, createErr
 	}
 
 	//执行转换
 	result, errs := service2.NewConversion().Conversion(request)
 	if errs != nil {
 		log.Info("转换出错" + errs.Error())
-		return false
+		return false, errs
 	}
 	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 false, errs
 	}
-	return true
+	return true, nil
 }

domain/entity/serversitemicros/docserverproject.go

@@ -34,7 +34,7 @@ type DocServerProject struct {
 	AppID int32 `json:"app_id,omitempty"`
 	// 是否私有  1 是 0 否
 	IsPrivate int8 `json:"is_private,omitempty"`
-	// 状态 0 待执行  1 创建转换（待获取进度），2 进度完成待回调 3，回调成功（全部成功）
+	// 状态 0 待执行  1 创建转换（待获取进度），2 进度完成待回调 3，回调成功(全部成功) 4 回调失败   5，执行转换失败
 	Status int32 `json:"status,omitempty"`
 	// 回调信息
 	CallbackRes string `json:"callback_res,omitempty"`

domain/entity/serversitemicros/docserverproject/docserverproject.go

@@ -70,7 +70,7 @@ func ValidColumn(column string) bool {
 //
 //	import _ "doc-service/domain/entity/serversitemicros/runtime"
 var (
-	Hooks [5]ent.Hook
+	Hooks [4]ent.Hook
 	// DefaultProjectName holds the default value on creation for the "project_name" field.
 	DefaultProjectName string
 	// DefaultSourceType holds the default value on creation for the "source_type" field.
@@ -89,8 +89,8 @@ var (
 	DefaultIsPrivate int8
 	// DefaultStatus holds the default value on creation for the "status" field.
 	DefaultStatus int32
-	// DefaultCallbackRes holds the default value on creation for the "callback_res" field.
-	DefaultCallbackRes string
+	// CallbackResValidator is a validator for the "callback_res" field. It is called by the builders before save.
+	CallbackResValidator func(string) error
 )
 
 // OrderOption defines the ordering options for the DocServerProject queries.

domain/entity/serversitemicros/docserverproject_create.go

@@ -152,14 +152,6 @@ func (dspc *DocServerProjectCreate) SetCallbackRes(s string) *DocServerProjectCr
 	return dspc
 }
 
-// SetNillableCallbackRes sets the "callback_res" field if the given value is not nil.
-func (dspc *DocServerProjectCreate) SetNillableCallbackRes(s *string) *DocServerProjectCreate {
-	if s != nil {
-		dspc.SetCallbackRes(*s)
-	}
-	return dspc
-}
-
 // SetCreatedAt sets the "created_at" field.
 func (dspc *DocServerProjectCreate) SetCreatedAt(t time.Time) *DocServerProjectCreate {
 	dspc.mutation.SetCreatedAt(t)
@@ -245,10 +237,6 @@ func (dspc *DocServerProjectCreate) defaults() error {
 		v := docserverproject.DefaultStatus
 		dspc.mutation.SetStatus(v)
 	}
-	if _, ok := dspc.mutation.CallbackRes(); !ok {
-		v := docserverproject.DefaultCallbackRes
-		dspc.mutation.SetCallbackRes(v)
-	}
 	return nil
 }
 
@@ -288,6 +276,11 @@ func (dspc *DocServerProjectCreate) check() error {
 	if _, ok := dspc.mutation.CallbackRes(); !ok {
 		return &ValidationError{Name: "callback_res", err: errors.New(`serversitemicros: missing required field "DocServerProject.callback_res"`)}
 	}
+	if v, ok := dspc.mutation.CallbackRes(); ok {
+		if err := docserverproject.CallbackResValidator(v); err != nil {
+			return &ValidationError{Name: "callback_res", err: fmt.Errorf(`serversitemicros: validator failed for field "DocServerProject.callback_res": %w`, err)}
+		}
+	}
 	return nil
 }
 

domain/entity/serversitemicros/docserverproject_update.go

@@ -265,6 +265,11 @@ func (dspu *DocServerProjectUpdate) check() error {
 			return &ValidationError{Name: "target_url", err: fmt.Errorf(`serversitemicros: validator failed for field "DocServerProject.target_url": %w`, err)}
 		}
 	}
+	if v, ok := dspu.mutation.CallbackRes(); ok {
+		if err := docserverproject.CallbackResValidator(v); err != nil {
+			return &ValidationError{Name: "callback_res", err: fmt.Errorf(`serversitemicros: validator failed for field "DocServerProject.callback_res": %w`, err)}
+		}
+	}
 	return nil
 }
 
@@ -601,6 +606,11 @@ func (dspuo *DocServerProjectUpdateOne) check() error {
 			return &ValidationError{Name: "target_url", err: fmt.Errorf(`serversitemicros: validator failed for field "DocServerProject.target_url": %w`, err)}
 		}
 	}
+	if v, ok := dspuo.mutation.CallbackRes(); ok {
+		if err := docserverproject.CallbackResValidator(v); err != nil {
+			return &ValidationError{Name: "callback_res", err: fmt.Errorf(`serversitemicros: validator failed for field "DocServerProject.callback_res": %w`, err)}
+		}
+	}
 	return nil
 }
 

domain/entity/serversitemicros/migrate/schema.go

@@ -69,7 +69,7 @@ var (
 		{Name: "app_id", Type: field.TypeInt32, Default: 0, SchemaType: map[string]string{"mysql": "int"}},
 		{Name: "is_private", Type: field.TypeInt8, Default: 0, SchemaType: map[string]string{"mysql": "tinyint"}},
 		{Name: "status", Type: field.TypeInt32, Default: 0, SchemaType: map[string]string{"mysql": "int"}},
-		{Name: "callback_res", Type: field.TypeString, Default: "", SchemaType: map[string]string{"mysql": "varchar(255)"}},
+		{Name: "callback_res", Type: field.TypeString, Size: 65535, SchemaType: map[string]string{"mysql": "text"}},
 		{Name: "created_at", Type: field.TypeTime, Nullable: true, SchemaType: map[string]string{"mysql": "datetime"}},
 	}
 	// DocServerProjectTable holds the schema information for the "doc_server_project" table.

domain/entity/serversitemicros/runtime/runtime.go

@@ -72,7 +72,6 @@ func init() {
 	docserverproject.Hooks[1] = docserverprojectHooks[1]
 	docserverproject.Hooks[2] = docserverprojectHooks[2]
 	docserverproject.Hooks[3] = docserverprojectHooks[3]
-	docserverproject.Hooks[4] = docserverprojectHooks[4]
 	docserverprojectFields := schema.DocServerProject{}.Fields()
 	_ = docserverprojectFields
 	// docserverprojectDescProjectName is the schema descriptor for project_name field.
@@ -113,8 +112,8 @@ func init() {
 	docserverproject.DefaultStatus = docserverprojectDescStatus.Default.(int32)
 	// docserverprojectDescCallbackRes is the schema descriptor for callback_res field.
 	docserverprojectDescCallbackRes := docserverprojectFields[10].Descriptor()
-	// docserverproject.DefaultCallbackRes holds the default value on creation for the callback_res field.
-	docserverproject.DefaultCallbackRes = docserverprojectDescCallbackRes.Default.(string)
+	// docserverproject.CallbackResValidator is a validator for the "callback_res" field. It is called by the builders before save.
+	docserverproject.CallbackResValidator = docserverprojectDescCallbackRes.Validators[0].(func(string) error)
 }
 
 const (

domain/entity/serversitemicros/schema/doc_server_project.go

@@ -59,11 +59,11 @@ func (DocServerProject) Fields() []ent.Field {
 		
 		field.Int32("status").SchemaType(map[string]string{
 			dialect.MySQL: "int",
-		}).Default(0).Comment(`状态 0 待执行  1 创建转换（待获取进度），2 进度完成待回调 3，回调成功（全部成功） `),
+		}).Default(0).Comment(`状态 0 待执行  1 创建转换（待获取进度），2 进度完成待回调 3，回调成功(全部成功) 4 回调失败   5，执行转换失败`),
 		
-		field.String("callback_res").SchemaType(map[string]string{
-            dialect.MySQL: "varchar(255)",
-        }).Default(``).Comment(`回调信息`),
+		field.Text("callback_res").SchemaType(map[string]string{
+            dialect.MySQL: "text",
+        }).MaxLen(65535).Comment(`回调信息`),
 		
 		field.Time("created_at").SchemaType(map[string]string{
             dialect.MySQL: "datetime",
@@ -84,6 +84,5 @@ func (DocServerProject) Hooks() []ent.Hook {
         validator.MaxRuneLen("source_type", 16),
         validator.MaxRuneLen("target_type", 16),
         validator.MaxRuneLen("task_id", 128),
-        validator.MaxRuneLen("callback_res", 255),
     }
 }

domain/repository/convert_reposity.go

@@ -189,10 +189,9 @@ func (o *Conversion) Conversion(arg *DoConversionRequest) (map[string]interface{
 		return ret, _err
 	}
 
-	log.Info("转换请求参数: %s")
 	// 返回值为 Map 类型，可从 Map 中获得三类数据：响应体 body、响应头 headers、HTTP 返回的状态码 statusCode。
 	res, err := ossClient.CallApi(params, request, runtime)
-	log.Info("DoConversion result返回：%s")
+	log.Info("DoConversion result返回：")
 	if err != nil {
 		return ret, err
 	}
@@ -213,16 +212,15 @@ func (o *Conversion) CreateImClient() (_result *imm20200930.Client, _err error)
 }
 
 // 创建项目
-func (o *Conversion) CreateProject() (_err error) {
+func (o *Conversion) CreateProject(projectName string) (_err error) {
 	client, createError := o.CreateImClient()
-	fmt.Println(client)
 	if createError != nil {
 		return createError
 	}
 
 	createProjectRequest := &imm20200930.CreateProjectRequest{}
-	ProjectName := "DOC_TO_PDF"
-	createProjectRequest.ProjectName = &ProjectName
+	//ProjectName := "DOC_TO_PDF"
+	createProjectRequest.ProjectName = &projectName
 	runtime := &util.RuntimeOptions{}
 
 	tryErr := func() (_e error) {
@@ -254,7 +252,7 @@ func (o *Conversion) CreateProject() (_err error) {
 			return decodeError
 		}
 		if m, ok := data.(map[string]interface{}); ok {
-			log.Error("创建项目出现异常%s")
+			log.Error("创建项目出现异常")
 			resultCode, assertCodeError := util.AssertAsString(m["Code"])
 			if assertCodeError != nil {
 				return assertCodeError
@@ -268,7 +266,7 @@ func (o *Conversion) CreateProject() (_err error) {
 		if assertError != nil {
 			return assertError
 		}
-		log.Error("创建项目出现异常%s")
+		log.Error("创建项目出现异常")
 	}
 	return nil
 }

domain/service/convert_service.go

@@ -54,7 +54,7 @@ func (doc *DocServiceService) DoConversion(c context.Context, req *pb.DoConversi
 	}
 
 	//创建项目
-	createErr := service.NewConversion().CreateProject()
+	createErr := service.NewConversion().CreateProject(req.ProjectName)
 	if createErr != nil {
 		resp.Msg = createErr.Error()
 		resp.Code = 100010