feat:封装钉钉文件上传接口

opms_libary/plugin/dingtalk/client.go

@@ -7,8 +7,8 @@ import (
 	"dashoo.cn/opms_libary/plugin/dingtalk/context"
 	"dashoo.cn/opms_libary/plugin/dingtalk/jsapi"
 	"dashoo.cn/opms_libary/plugin/dingtalk/message"
+	"dashoo.cn/opms_libary/plugin/dingtalk/storage"
 	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
-	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gcache"
 	"sync"
 )
@@ -28,12 +28,12 @@ func init() {
 
 func NewClient() *ClientImpl {
 	var config = context.Config{
-		CorpId:    g.Config().GetString("dingtalk.corp-id"),    //"dinga8b316209f5ee42435c2f4657eb6378f",
-		AgentId:   g.Config().GetString("dingtalk.agent-id"),   //"2384115071",
-		AppKey:    g.Config().GetString("dingtalk.app-key"),    //"dinguytykawticadfoht",
-		AppSecret: g.Config().GetString("dingtalk.app-secret"), //"zPlj4ZpITsUbeq2C0GrwJ78-e8knH_kIeyvznaNQacqtrSb9zbeZcOajgBKdolky",
-		AESKey:    g.Config().GetString("dingtalk.aes-key"),    //"oUjmeWea8Ow1jsdK4UHoDthy6EMQKq3RGbM2rEeTgnm",
-		Token:     g.Config().GetString("dingtalk.token"),      //"WaasHsYk8V3wqwN5xRGsCmiiRDB",
+		CorpId:    "dinga8b316209f5ee42435c2f4657eb6378f",                             //g.Config().GetString("dingtalk.corp-id"),    //
+		AgentId:   "2384115071",                                                       // g.Config().GetString("dingtalk.agent-id"),   //
+		AppKey:    "dinguytykawticadfoht",                                             //g.Config().GetString("dingtalk.app-key"),    //
+		AppSecret: "zPlj4ZpITsUbeq2C0GrwJ78-e8knH_kIeyvznaNQacqtrSb9zbeZcOajgBKdolky", //g.Config().GetString("dingtalk.app-secret"), //
+		AESKey:    "oUjmeWea8Ow1jsdK4UHoDthy6EMQKq3RGbM2rEeTgnm",                      //g.Config().GetString("dingtalk.aes-key"),    //
+		Token:     "WaasHsYk8V3wqwN5xRGsCmiiRDB",                                      //g.Config().GetString("dingtalk.token"),      //
 	}
 	return newClient(config)
 }
@@ -81,6 +81,11 @@ func (c *ClientImpl) GetCalendar() *calendar.Calendar {
 	return calendar.NewCalendar(c.Context)
 }
 
+//GetStorage 获取Jsapi
+func (c *ClientImpl) GetStorage() *storage.Storage {
+	return storage.NewStorage(c.Context)
+}
+
 // GetDingTalkHandler 消息管理
 func (c *ClientImpl) GetDingTalkHandler(msg *message.SubsMessage) *bridge.DingTalkHandler {
 	c.Context.SubsMessage = msg

opms_libary/plugin/dingtalk/client_test.go

@@ -3,6 +3,7 @@ package dingtalk
 import (
 	"dashoo.cn/opms_libary/plugin/dingtalk/workflow"
 	"dashoo.cn/opms_libary/utils"
+	"encoding/json"
 	"fmt"
 	"testing"
 )
@@ -17,11 +18,23 @@ func TestQuerySchemaByProcessCode(t *testing.T) {
 }
 
 func TestSign(t *testing.T) {
-	client := NewClient()
-	s := client.GetJsapi()
-	//s.Sign("", "")
+	//client := NewClient()
+	//s := client.GetStorage()
+	//resp, _ := s.QueryFileUploadInfo("21042518430", "fHJtftdpHZXwvsdOfg8skgiEiE")
+	//code, _ := s.UploadFile(resp.HeaderSignatureInfo.ResourceUrls[0], resp.HeaderSignatureInfo.Headers, "/Users/chengjian/Downloads/引物导入模板.xlsx")
+	//if code == 200 {
+	//	s.CommitFile(resp.UploadKey, "引物导入模板-1.xlsx", "21042518430", "0", "fHJtftdpHZXwvsdOfg8skgiEiE")
+	//}
+	//
+	//fmt.Println(resp)
+}
 
-	fmt.Println(s)
+func TestCommitFile(t *testing.T) {
+	client := NewClient()
+	s := client.GetStorage()
+	resp, err := s.UploadFile("21042518430", "8xljy04PZiS9iPxp5PhDnUzQiEiE", "引物导入模板-000000.xlsx", "/Users/chengjian/Downloads/引物导入模板.xlsx")
+	fmt.Println(json.Marshal(resp))
+	fmt.Println(err.Error())
 }
 
 func TestStartProcessInstance(t *testing.T) {

opms_libary/plugin/dingtalk/storage/entity.go

@@ -1,48 +1,203 @@
 package storage
 
-import "time"
+type AddSpaceRequest struct {
+	// 可选参数
+	Option *AddSpaceRequestOption `json:"option,omitempty"`
+	// 用户id
+	UnionId *string `json:"unionId,omitempty"`
+}
+
+type AddSpaceRequestOption struct {
+	// 空间能力项, 默认表示不设置拓展能力项
+	Capabilities *AddSpaceRequestOptionCapabilities `json:"capabilities,omitempty"`
+	// 空间名称，默认无空间名称
+	Name *string `json:"name,omitempty"`
+	// owner类型, 空间Owner可以是用户或应用
+	// 如果是应用类型，需要单独授权
+	// 枚举值:
+	// 	USER: 用户类型
+	// 	APP: App类型
+	// 默认值:
+	// 	USER
+	OwnerType *string `json:"ownerType,omitempty"`
+	// 空间能使用最大容量, 默认表示无最大容量
+	Quota *int64 `json:"quota,omitempty"`
+	// 空间场景，详见 Space.scene 字段. 不指定默认值是default
+	// 只能由数字和字母组成
+	// 默认值:
+	// 	default
+	Scene *string `json:"scene,omitempty"`
+	// 空间场景Id，详见 Space.sceneId 字段. 不指定默认值是0
+	// 只能由数字和字母组成
+	// 默认值:
+	// 	0
+	SceneId *string `json:"sceneId,omitempty"`
+}
+
+type AddSpaceRequestOptionCapabilities struct {
+	// 是否进最近使用, 默认不支持
+	// 默认值:
+	// 	false
+	CanRecordRecentFile *bool `json:"canRecordRecentFile,omitempty"`
+	// 是否支持重命名空间名称, 默认不支持
+	// 默认值:
+	// 	false
+	CanRename *bool `json:"canRename,omitempty"`
+	// 是否支持搜索, 默认不支持
+	// 默认值:
+	// 	false
+	CanSearch *bool `json:"canSearch,omitempty"`
+}
+
+type AddPermissionRequestOption struct {
+	// 有效时间(秒)
+	// 最大值:
+	// 	3600
+	Duration *int64 `json:"duration,omitempty" xml:"duration,omitempty"`
+}
+
+type AddPermissionRequestMembers struct {
+	// 权限归属的企业
+	// 如果存在企业id, 对应member离职的时候会自动清理权限
+	// 如果memberType是dept类型，必须要有企业id
+	CorpId *string `json:"corpId,omitempty" xml:"corpId,omitempty"`
+	// 权限成员id
+	Id *string `json:"id,omitempty" xml:"id,omitempty"`
+	// 权限成员类型
+	// 枚举值:
+	// 	ORG: 企业
+	// 	DEPT: 部门
+	// 	TAG: 自定义tag
+	// 	CONVERSATION: 会话
+	// 	GG: 通用组
+	// 	USER: 用户
+	// 	ALL_USERS: 所有用户
+	Type *string `json:"type,omitempty" xml:"type,omitempty"`
+}
+
+type AddPermissionRequest struct {
+	// 权限成员列表
+	// 最大size:
+	// 	30
+	Members []*AddPermissionRequestMembers `json:"members,omitempty" xml:"members,omitempty" type:"Repeated"`
+	// 可选参数
+	Option *AddPermissionRequestOption `json:"option,omitempty" xml:"option,omitempty" type:"Struct"`
+	// 权限角色id
+	RoleId *string `json:"roleId,omitempty" xml:"roleId,omitempty"`
+	// 用户id
+	UnionId *string `json:"unionId,omitempty" xml:"unionId,omitempty"`
+}
+
+type AddPermissionResponse struct {
+	Success bool `json:"success"`
+}
+
+type GetFileUploadInfoRequestOptionPreCheckParam struct {
+	Md5      *string `json:"md5,omitempty" xml:"md5,omitempty"`
+	Name     *string `json:"name,omitempty" xml:"name,omitempty"`
+	ParentId *string `json:"parentId,omitempty" xml:"parentId,omitempty"`
+	Size     *int64  `json:"size,omitempty" xml:"size,omitempty"`
+}
+
+type GetFileUploadInfoRequestOption struct {
+	PreCheckParam  *GetFileUploadInfoRequestOptionPreCheckParam `json:"preCheckParam,omitempty" xml:"preCheckParam,omitempty" type:"Struct"`
+	PreferIntranet *bool                                        `json:"preferIntranet,omitempty" xml:"preferIntranet,omitempty"`
+	PreferRegion   *string                                      `json:"preferRegion,omitempty" xml:"preferRegion,omitempty"`
+	StorageDriver  *string                                      `json:"storageDriver,omitempty" xml:"storageDriver,omitempty"`
+}
+
+type GetFileUploadInfoRequest struct {
+	Multipart *bool                           `json:"multipart,omitempty" `
+	Option    *GetFileUploadInfoRequestOption `json:"option,omitempty"`
+	Protocol  *string                         `json:"protocol,omitempty" `
+	UnionId   *string                         `json:"unionId,omitempty"`
+}
 
 type QueryFileUploadInfoResponse struct {
 	UploadKey           string `json:"uploadKey"`
 	StorageDriver       string `json:"storageDriver"`
 	Protocol            string `json:"protocol"`
 	HeaderSignatureInfo struct {
-		ResourceUrls []string `json:"resourceUrls"`
-		Headers      struct {
-			Key string `json:"key"`
-		} `json:"headers"`
-		ExpirationSeconds    int      `json:"expirationSeconds"`
-		Region               string   `json:"region"`
-		InternalResourceUrls []string `json:"internalResourceUrls"`
+		ResourceUrls         []string          `json:"resourceUrls"`
+		Headers              map[string]string `json:"headers"`
+		ExpirationSeconds    int               `json:"expirationSeconds"`
+		Region               string            `json:"region"`
+		InternalResourceUrls []string          `json:"internalResourceUrls"`
 	} `json:"headerSignatureInfo"`
 }
 
+type CommitFileRequestOptionAppProperties struct {
+	// 属性名称 该属性名称在当前app下需要保证唯一，不同app间同名属性互不影响
+	Name *string `json:"name,omitempty" xml:"name,omitempty"`
+	// 属性值
+	Value *string `json:"value,omitempty" xml:"value,omitempty"`
+	// 属性可见范围
+	// 枚举值:
+	// 	PUBLIC: 该属性所有App可见
+	// 	PRIVATE: 该属性仅其归属App可见
+	Visibility *string `json:"visibility,omitempty" xml:"visibility,omitempty"`
+}
+
+type CommitFileRequestOption struct {
+	// 文件在应用上的属性, 一个应用最多只能设置3个属性
+	AppProperties []*CommitFileRequestOptionAppProperties `json:"appProperties,omitempty" xml:"appProperties,omitempty" type:"Repeated"`
+	// 文件名称冲突策略
+	// 枚举值:
+	// 	AUTO_RENAME: 自动重命名
+	// 	OVERWRITE: 覆盖
+	// 	RETURN_DENTRY_IF_EXISTS: 返回已存在文件
+	// 	RETURN_ERROR_IF_EXISTS: 文件已存在时报错
+	// 默认值:
+	// 	AUTO_RENAME
+	ConflictStrategy *string `json:"conflictStrategy,omitempty" xml:"conflictStrategy,omitempty"`
+	// 默认文件大小, 单位:Byte
+	// 如果此字段不为空，企业存储系统会校验文件实际大小是否和此字段是否一致，不一致会报错
+	Size *int64 `json:"size,omitempty" xml:"size,omitempty"`
+}
+
+type CommitFileRequest struct {
+	// 名称(文件名+后缀), 规则：
+	// 1. 头尾不能包含空格，否则会自动去除
+	// 2. 不能包含特殊字符，包括：制表符、*、"、<、>、|
+	// 3. 不能以"."结尾
+	Name *string `json:"name,omitempty" xml:"name,omitempty"`
+	// 可选参数
+	Option *CommitFileRequestOption `json:"option,omitempty" xml:"option,omitempty" type:"Struct"`
+	// 父目录id, 根目录id值为0
+	ParentId *string `json:"parentId,omitempty" xml:"parentId,omitempty"`
+	// 添加文件唯一标识，可通过DentryService.getUploadInfo来生成
+	UploadKey *string `json:"uploadKey,omitempty" xml:"uploadKey,omitempty"`
+	// 用户id
+	UnionId *string `json:"unionId,omitempty" xml:"unionId,omitempty"`
+}
+
 type CommitFileResponse struct {
 	Dentry struct {
-		Id           string    `json:"id"`
-		SpaceId      string    `json:"spaceId"`
-		ParentId     string    `json:"parentId"`
-		Type         string    `json:"type"`
-		Name         string    `json:"name"`
-		Size         int       `json:"size"`
-		Path         string    `json:"path"`
-		Version      int       `json:"version"`
-		Status       string    `json:"status"`
-		Extension    string    `json:"extension"`
-		CreatorId    string    `json:"creatorId"`
-		ModifierId   string    `json:"modifierId"`
-		CreateTime   time.Time `json:"createTime"`
-		ModifiedTime time.Time `json:"modifiedTime"`
-		Properties   struct {
-			ReadOnly bool `json:"readOnly"`
-		} `json:"properties"`
-		AppProperties []struct {
-			Name       string `json:"name"`
-			Value      string `json:"value"`
-			Visibility string `json:"visibility"`
-		} `json:"appProperties"`
+		ModifiedTime  string `json:"modifiedTime"`
+		Extension     string `json:"extension"`
+		CreatorId     string `json:"creatorId"`
+		ModifierId    string `json:"modifierId"`
+		Type          string `json:"type"`
 		Uuid          string `json:"uuid"`
 		PartitionType string `json:"partitionType"`
+		ParentId      string `json:"parentId"`
+		SpaceId       string `json:"spaceId"`
+		Path          string `json:"path"`
+		Size          int    `json:"size"`
+		CreateTime    string `json:"createTime"`
 		StorageDriver string `json:"storageDriver"`
+		Name          string `json:"name"`
+		Id            string `json:"id"`
+		Properties    struct {
+			ReadOnly bool `json:"readOnly"`
+		} `json:"properties"`
+		Status        string `json:"status"`
+		AppProperties struct {
+			EedFQcfwBC4HZvNzsES5IiOpPrfoiS3ZFw []struct {
+				Visibility string `json:"visibility"`
+				Name       string `json:"name"`
+				Value      string `json:"value"`
+			} `json:"EedFQcfwBC4hZvNzsES5iiOpPrfoiS3ZFw"`
+		} `json:"appProperties"`
 	} `json:"dentry"`
 }

opms_libary/plugin/dingtalk/storage/storage.go

@@ -1,14 +1,23 @@
 package storage
 
 import (
-	"dashoo.cn/opms_libary/multipart"
+	"dashoo.cn/opms_libary/myerrors"
 	"dashoo.cn/opms_libary/plugin/dingtalk/base"
 	"dashoo.cn/opms_libary/plugin/dingtalk/context"
+	"dashoo.cn/opms_libary/utils"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path/filepath"
 )
 
 const (
-	FormSchemasUrl     = "/v1.0/workflow/forms/schemas/processCodes"
-	ProcessInstanceUrl = "/v1.0/workflow/processInstances"
+	AddPermissionUrl        = "/v1.0/storage/spaces/%s/dentries/0/permissions"  //添加权限
+	QueryFileUploadInfoUrl  = "/v1.0/storage/spaces/%s/files/uploadInfos/query" //获取文件上传信息
+	CommitFileUploadInfoUrl = "/v1.0/storage/spaces/%s/files/commit"            //提交文件
 )
 
 //Storage OA审批
@@ -23,20 +32,143 @@ func NewStorage(context *context.Context) *Storage {
 	return material
 }
 
+//CreateSpaces 创建空间
+func (w *Storage) CreateSpaces(spaceId, unionId string) (response QueryFileUploadInfoResponse, err error) {
+	optionCapabilities := &AddSpaceRequestOptionCapabilities{
+		CanSearch:           utils.Bool(true),
+		CanRename:           utils.Bool(true),
+		CanRecordRecentFile: utils.Bool(true),
+	}
+	option := &AddSpaceRequestOption{
+		Name:         utils.String("OMS合同"),
+		Capabilities: optionCapabilities,
+		OwnerType:    utils.String("APP"),
+	}
+	request := &AddSpaceRequest{
+		UnionId: utils.String("8xljy04PZiS9iPxp5PhDnUzQiEiE"),
+		Option:  option,
+	}
+
+	resp, _ := w.HTTPPostJSONWithAccessToken("/v1.0/storage/spaces", request)
+	fmt.Println(resp)
+	return response, err
+}
+
+//AddPermission 添加权限
+func (w *Storage) AddPermission(corpId, spaceId, unionId, roleId, memType string) (response AddPermissionResponse, err error) {
+	option := &AddPermissionRequestOption{
+		Duration: utils.Int64(3600),
+	}
+	members := &AddPermissionRequestMembers{
+		Type:   utils.String(memType),
+		Id:     utils.String(unionId),
+		CorpId: utils.String(corpId),
+	}
+	request := &AddPermissionRequest{
+		UnionId: utils.String(unionId),
+		RoleId:  utils.String(roleId),
+		Members: []*AddPermissionRequestMembers{members},
+		Option:  option,
+	}
+	resp, err := w.HTTPPostJSONWithAccessToken(fmt.Sprintf(AddPermissionUrl, spaceId), request)
+	err = json.Unmarshal(resp, &response)
+	return response, err
+}
+
 //QueryFileUploadInfo 获取文件上传信息
 func (w *Storage) QueryFileUploadInfo(spaceId, unionId string) (response QueryFileUploadInfoResponse, err error) {
-
+	option := &GetFileUploadInfoRequestOption{
+		StorageDriver:  utils.String("DINGTALK"),
+		PreferRegion:   utils.String("SHANGHAI"),
+		PreferIntranet: utils.Bool(true),
+	}
+	request := &GetFileUploadInfoRequest{
+		UnionId:   utils.String(unionId),
+		Protocol:  utils.String("HEADER_SIGNATURE"),
+		Multipart: utils.Bool(false),
+		Option:    option,
+	}
+	resp, err := w.HTTPPostJSONWithAccessToken(fmt.Sprintf(QueryFileUploadInfoUrl, spaceId), request)
+	err = json.Unmarshal(resp, &response)
 	return response, err
 }
 
 //UploadFile 使用OSS的header加签方式上传文件息
-func (w *Storage) UploadFile(url string, headers map[string]string, file *multipart.MultipartFile) (code int64, err error) {
+func (w *Storage) uploadFile(url string, headers map[string]string, filePath string) (code int, err error) {
+	count := 100
+
+	file, err := os.Open(filepath.Clean(filePath))
+	if err != nil {
+		return 0, myerrors.SysError()
+	}
+	defer file.Close()
 
-	return 0, err
+	line, err := ioutil.ReadAll(file)
+
+	pr, rw := io.Pipe()
+	go func() {
+		for i := 0; i < count; i++ {
+			rw.Write(line)
+		}
+		rw.Close()
+	}()
+	// 构造request对象
+	request, err := http.NewRequest("PUT", url, pr)
+	for key, value := range headers {
+		request.Header.Add(key, value)
+	}
+
+	// 提前计算出ContentLength
+	request.ContentLength = int64(len(line) * count)
+	resp, _ := http.DefaultClient.Do(request)
+	return resp.StatusCode, err
 }
 
 //CommitFile 提交文件
-func (w *Storage) CommitFile(uploadKey, filename, parentId string) (response CommitFileResponse, err error) {
-
+func (w *Storage) CommitFile(uploadKey, filename, spaceId, parentId, unionId string) (response CommitFileResponse, err error) {
+	optionAppProperties0 := &CommitFileRequestOptionAppProperties{
+		Name:       utils.String("System"),
+		Value:      utils.String("oms"),
+		Visibility: utils.String("PUBLIC"),
+	}
+	option := &CommitFileRequestOption{
+		//Size:             utils.Int64(size),
+		ConflictStrategy: utils.String("AUTO_RENAME"),
+		AppProperties:    []*CommitFileRequestOptionAppProperties{optionAppProperties0},
+	}
+	request := &CommitFileRequest{
+		UnionId:   utils.String(unionId),
+		UploadKey: utils.String(uploadKey),
+		Name:      utils.String(filename),
+		ParentId:  utils.String(parentId),
+		Option:    option,
+	}
+	resp, err := w.HTTPPostJSONWithAccessToken(fmt.Sprintf(CommitFileUploadInfoUrl, spaceId), request)
+	err = json.Unmarshal(resp, &response)
 	return response, err
 }
+
+func (w *Storage) UploadFile(spaceId, unionId, fileName, filePath string) (response CommitFileResponse, err error) {
+	permResp, err := w.AddPermission(w.CorpId, spaceId, unionId, "EDITOR", "USER")
+	if err != nil {
+		return response, myerrors.New(500, err, err.Error())
+	}
+
+	if !permResp.Success {
+		return response, myerrors.New(500, nil, "获取钉钉上传文件权限失败！")
+	}
+
+	infoResp, err := w.QueryFileUploadInfo(spaceId, unionId)
+	if err != nil {
+		return response, myerrors.New(500, err, err.Error())
+	}
+
+	uploadResp, err := w.uploadFile(infoResp.HeaderSignatureInfo.ResourceUrls[0], infoResp.HeaderSignatureInfo.Headers, filePath)
+	if err != nil {
+		return response, myerrors.New(500, err, err.Error())
+	}
+	if uploadResp != 200 {
+		return response, myerrors.New(500, nil, "文件上传失败！")
+	}
+	return w.CommitFile(infoResp.UploadKey, fileName, spaceId, "0", unionId)
+}