add chaoxing and vtencent

[msterzhang]

• 新增挂载超星小组网盘
• 新增挂载腾讯智能创作平台文件挂载

[welcome]

Thanks for opening this pull request! Please check out our contributing guidelines.

[foxxorcat]

Suggested change

	})
	}).ForceContentType("application/json")

响应头ContentType有问题，所以后面json不解析。可以加上这个解决

[foxxorcat]

Suggested change

	req.SetBody(dat)
	req.SetBody(form)

设置"content-type": "application/json"头后，可以直接发json字符串。

[foxxorcat]

抓包看第三个参数好像是文件sha1，用于判断秒传？

[foxxorcat]

腾讯cos可以用s3上传，代码大致是这样.少写代码😏

        params := rspUGC.Data
	certificate := params.TempCertificate
	cfg := &aws.Config{
		HTTPClient: base.HttpClient,
		// S3ForcePathStyle: aws.Bool(true),
		Credentials: credentials.NewStaticCredentials(certificate.SecretID, certificate.SecretKey, certificate.Token),
		Region:      aws.String(params.StorageRegionV5),
		Endpoint:    aws.String(fmt.Sprintf("cos.%s.myqcloud.com", params.StorageRegionV5)),
	}
	ss, err := session.NewSession(cfg)
	if err != nil {
		return nil, err
	}
	uploader := s3manager.NewUploader(ss)
	input := &s3manager.UploadInput{
		Bucket: aws.String(fmt.Sprintf("%s-%d", params.StorageBucket, params.StorageAppID)),
		Key:    &params.Video.StoragePath,
		Body:   stream,
	}
	out, err := uploader.UploadWithContext(ctx, input)
	if err != nil {
		return nil, err
	}
	Etag := strings.Trim(*out.ETag, "\"")

[msterzhang]

改了试了下，报InvalidArgument错误

[foxxorcat]

没问题啊,你是不是把Etag传CompleteMultipartUpload里面去了.
我贴的代码把368-379替换了改一改就可用直接跑成功的啊

FinishUploadMaterial 的 SummaryKey 是文件sha1 在上面rspCreatrMaterial.Data.QuickUpload为true时使用的,用于秒传跳过ApplyUploadUGC到CommitUploadUGC这些方法

[msterzhang]

已测试跑完没问题，不需要CompleteMultipartUpload，但是有个问题UploadSummaryKey并不是sha1，这个东西会变变，你可以同一个文件多传几次看看 ，暂时不知道生成规则

[foxxorcat]

没问题就是sha1

不过大于10MIB的文件UploadSummaryKey只计算前10485760字节

[msterzhang]

ok 已经测试成功！秒传没问题了

[foxxorcat]

> 响应头ContentType有问题，所以后面json不解析。可以加上这个解决

这里你理解错了,我的意识是可用把代码改成这样,不需要额外json.Unmarshal. 只需要传入request就行

Suggested change

	var resps RspFiles
	rsp, err := d.request(api, http.MethodPost, func(req *resty.Request) {
	req.SetBody(form).ForceContentType("application/json")
	}, &resps)
	if err != nil {
	}
	if err := json.Unmarshal(rsp, &resps); err != nil {
	return []File{}, err
	}
	var resps RspFiles
	rsp, err := d.request(api, http.MethodPost, func(req *resty.Request) {
	req.SetBody(form)
	}, &resps)
	if err != nil {
	return []File{}, err
	}

[foxxorcat]

Suggested change

	func (d *Vtencent) FileUpload(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
	classId, err := strconv.Atoi(dstDir.GetID())
	if err != nil {
	return err
	}
	tmpF, err := stream.CacheFullInTempFile()
	if err != nil {
	return err
	}
	SummaryKey, err := utils.HashFile(utils.SHA1, tmpF)
	if err != nil {
	return err
	}
	chunkHash := SummaryKey
	var chunkLength int64 = 1024 * 1024 * 10
	if stream.GetSize() > chunkLength {
	buf := bytes.NewBuffer(make([]byte, 0, chunkLength))
	io.CopyN(buf, tmpF, chunkLength)
	chunkHash = utils.HashData(utils.SHA1, buf.Bytes())
	}
	rspCreatrMaterial, err := d.CreateUploadMaterial(classId, stream.GetName(), chunkHash)
	if err != nil {
	return err
	}
	if rspCreatrMaterial.Data.QuickUpload {
	UploadContext := rspCreatrMaterial.Data.UploadContext
	_, err = d.FinishHashUploadMaterial(SummaryKey, UploadContext)
	if err != nil {
	return err
	}
	return nil
	}
	rspUGC, err := d.ApplyUploadUGC(rspCreatrMaterial.Data.VodUploadSign, stream)
	if err != nil {
	return err
	}
	params := rspUGC.Data
	certificate := params.TempCertificate
	cfg := &aws.Config{
	HTTPClient: base.HttpClient,
	// S3ForcePathStyle: aws.Bool(true),
	Credentials: credentials.NewStaticCredentials(certificate.SecretID, certificate.SecretKey, certificate.Token),
	Region: aws.String(params.StorageRegionV5),
	Endpoint: aws.String(fmt.Sprintf("cos.%s.myqcloud.com", params.StorageRegionV5)),
	}
	ss, err := session.NewSession(cfg)
	if err != nil {
	return err
	}
	uploader := s3manager.NewUploader(ss)
	input := &s3manager.UploadInput{
	Bucket: aws.String(fmt.Sprintf("%s-%d", params.StorageBucket, params.StorageAppID)),
	Key: &params.Video.StoragePath,
	Body: stream,
	}
	_, err = uploader.UploadWithContext(ctx, input)
	if err != nil {
	return err
	}
	rspCommitUGC, err := d.CommitUploadUGC(rspCreatrMaterial.Data.VodUploadSign, rspUGC.Data.VodSessionKey)
	if err != nil {
	return err
	}
	VodVerifyKey := rspCommitUGC.Data.Video.VerifyContent
	VodFileId := rspCommitUGC.Data.FileID
	UploadContext := rspCreatrMaterial.Data.UploadContext
	_, err = d.FinishUploadMaterial(SummaryKey, VodVerifyKey, UploadContext, VodFileId)
	if err != nil {
	return err
	}
	return nil
	}
	func (d *Vtencent) FileUpload(ctx context.Context, dstDir model.Obj, stream model.FileStreamer, up driver.UpdateProgress) error {
	classId, err := strconv.Atoi(dstDir.GetID())
	if err != nil {
	return err
	}
	const chunkLength int64 = 1024 * 1024 * 10
	reader, err := stream.RangeRead(http_range.Range{Start: 0, Length: chunkLength})
	if err != nil {
	return err
	}
	chunkHash, err := utils.HashReader(utils.SHA1, reader)
	if err != nil {
	return err
	}
	rspCreatrMaterial, err := d.CreateUploadMaterial(classId, stream.GetName(), chunkHash)
	if err != nil {
	return err
	}
	if rspCreatrMaterial.Data.QuickUpload {
	SummaryKey := stream.GetHash().GetHash(utils.SHA1)
	if len(SummaryKey) < utils.SHA1.Width {
	if SummaryKey, err = utils.HashReader(utils.SHA1, stream); err != nil {
	return err
	}
	}
	UploadContext := rspCreatrMaterial.Data.UploadContext
	_, err = d.FinishHashUploadMaterial(SummaryKey, UploadContext)
	if err != nil {
	return err
	}
	return nil
	}
	hash := sha1.New()
	rspUGC, err := d.ApplyUploadUGC(rspCreatrMaterial.Data.VodUploadSign, stream)
	if err != nil {
	return err
	}
	params := rspUGC.Data
	certificate := params.TempCertificate
	cfg := &aws.Config{
	HTTPClient: base.HttpClient,
	// S3ForcePathStyle: aws.Bool(true),
	Credentials: credentials.NewStaticCredentials(certificate.SecretID, certificate.SecretKey, certificate.Token),
	Region: aws.String(params.StorageRegionV5),
	Endpoint: aws.String(fmt.Sprintf("cos.%s.myqcloud.com", params.StorageRegionV5)),
	}
	ss, err := session.NewSession(cfg)
	if err != nil {
	return err
	}
	uploader := s3manager.NewUploader(ss)
	input := &s3manager.UploadInput{
	Bucket: aws.String(fmt.Sprintf("%s-%d", params.StorageBucket, params.StorageAppID)),
	Key: &params.Video.StoragePath,
	Body: io.TeeReader(stream, io.MultiWriter(hash, driver.NewProgress(stream.GetSize(), up))),
	}
	_, err = uploader.UploadWithContext(ctx, input)
	if err != nil {
	return err
	}
	rspCommitUGC, err := d.CommitUploadUGC(rspCreatrMaterial.Data.VodUploadSign, rspUGC.Data.VodSessionKey)
	if err != nil {
	return err
	}
	VodVerifyKey := rspCommitUGC.Data.Video.VerifyContent
	VodFileId := rspCommitUGC.Data.FileID
	UploadContext := rspCreatrMaterial.Data.UploadContext
	SummaryKey := hex.EncodeToString(hash.Sum(nil))
	_, err = d.FinishUploadMaterial(SummaryKey, VodVerifyKey, UploadContext, VodFileId)
	if err != nil {
	return err
	}
	return nil
	}

可以改成这样优化一下大文件的上传

[msterzhang]

OK 之前对stream.RangeRead不太了解，我优化下这部分代码

[anwen-anyi]

腾讯智能创作平台和腾讯Cos可以互传吗？
还是说可以和所有 sha1 存储互相存储

[msterzhang]

腾讯智能创作平台和腾讯Cos可以互传吗？ 还是说可以和所有 sha1 存储互相存储

理论上这个秒传功能是针对单个客户的储存桶的

[welcome]

Congrats on merging your first pull request! We here at behavior bot are proud of you!