Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into feature/auth

server_api/render.api

@@ -31,6 +31,8 @@ type RenderNotifyReq {
 	Info NotifyInfo `json:"info"`
 }
 type NotifyInfo {
-	TaskId string `json:"task_id"` //任务id
-	Image  string `json:"image"`
+	TaskId  string `json:"task_id"` //任务id
+	UserId  int64  `json:"user_id"`
+	GuestId int64  `json:"guest_id"`
+	Image   string `json:"image"`
 }

server_api/resource.api

@@ -0,0 +1,33 @@
+syntax = "v1"
+
+info (
+	title: // TODO: add title
+	desc: // TODO: add description
+	author: ""
+	email: ""
+)
+
+import "basic.api"
+
+service resource {
+	@handler LogoCombineHandler
+	post /api/resource/logo-combine(LogoCombineReq) returns (response);
+
+	@handler ResourceInfoHandler
+	get /api/resource/info(ResourceInfoReq) returns (response);
+}
+
+type (
+	ResourceInfoReq {
+		ResourceId  string `form:"resource_id,optional"`  // 资源ID
+		ResourceKey string `form:"resource_key,optional"` // 资源唯一标识
+	}
+)
+
+type (
+	LogoCombineReq {
+		ResourceKey  string `form:"resource_key"`  // 资源唯一标识
+		CombineParam string `form:"combine_param"` // 合图参数
+		TemplateId   int64  `form:"template_id"`   // 合图参数
+	}
+)