Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Qiniuoss cannot upload non image attachments #2331

Merged
merged 2 commits into from
Aug 19, 2022
Merged

fix: Qiniuoss cannot upload non image attachments #2331

merged 2 commits into from
Aug 19, 2022

Conversation

AirboZH
Copy link
Member

@AirboZH AirboZH commented Aug 18, 2022

What type of PR is this?

/kind bug

What this PR does / why we need it:

发现在七牛的 QiniuOssFileHandler:145 行中,如果文件不是图片类型的话就跳过了setThumbPath
但是在其他文件存储的handler中(如:本地 LocalFileHandler:125, TencentCosFileHandler:128)调用了handleImageMetadata default方法,该方法最后判断 thumbPath 为空时会将其设为 filePath
故在七牛云handler使用了handleImageMetadata 方法,使得其他类型文件也可以setThumbPath,并成功上传不会引发错误

Which issue(s) this PR fixes:

Fixes #2320

Special notes for your reviewer:

看到其他文件handler中TencentCosFileHandler:130有一个 uploadResult.setThumbPath(fullPath); 好像是没有必要的,也在HuaweiObsFileHandler中不存在上述代码。

Does this PR introduce a user-facing change?

修复了七牛云做附件存储时附件无法上传非图片文件的问题

@f2c-ci-robot f2c-ci-robot bot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. kind/bug Categorizes issue or PR as related to a bug. labels Aug 18, 2022
@CLAassistant
Copy link

CLAassistant commented Aug 18, 2022

CLA assistant check
All committers have signed the CLA.

@JohnNiang
Copy link
Member

/cc @halo-dev/sig-halo

@JohnNiang
Copy link
Member

/cherry-pick release-1.5
/milestone 1.5.x

@halo-dev-bot
Copy link
Collaborator

@JohnNiang: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.5
/milestone 1.5.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@f2c-ci-robot f2c-ci-robot bot added this to the 1.5.x milestone Aug 18, 2022
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. labels Aug 18, 2022
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Aug 19, 2022
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Aug 19, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 19, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit 5d263d0 into halo-dev:master Aug 19, 2022
@halo-dev-bot
Copy link
Collaborator

@JohnNiang: new pull request created: #2336

In response to this:

/cherry-pick release-1.5
/milestone 1.5.x

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@AirboZH AirboZH deleted the fix#2320 branch August 19, 2022 07:59
f2c-ci-robot bot pushed a commit that referenced this pull request Aug 19, 2022
This is an automated cherry-pick of #2331

/assign JohnNiang

```release-note
修复了七牛云做附件存储时附件无法上传非图片文件的问题
```
f2c-ci-robot bot pushed a commit that referenced this pull request Oct 12, 2022
#### What type of PR is this?


#### What this PR does / why we need it:

发布 1.6.0

#### Special notes for your reviewer:

/cc @halo-dev/sig-halo 

```markdown
## Features

- SMTP 添加 STARTTLS 的设置支持。 #1861 halo-dev/console#552 @ntdgy @wangxiaoerYah
- 为邮件通知模板添加更多的可用参数,`email`、`status`、`createTime`、`authorUrl`。 #2095 @Yhcrown @iRoZhi
- 后台附件设置中添加 `去除图片 EXIF 信息` 的选项。 #2168 halo-dev/console#554 @SladeGranger @eziosudo @52lemon6
- 后台文章标签管理支持清理未使用标签。 halo-dev/console#587 @ruibaby
- 重构后台的友情链接管理页面,现在支持拖动排序以及分组管理。 halo-dev/console#574 #2105 @Camsyn @daifiyum @gungnir479

## Improvements

- 优化文章编辑时间更新的逻辑,目前更改为仅在修改文章标题或者内容时才更新。 #2195 @wxyShine @ListenV
- 修改后台管理页面为直接渲染而不是重定向,以更好地兼容反向代理。 #2259 @viticis
- 后台在构建时提供 gzip 压缩的资源。 halo-dev/console#547 @2211898719
- 后台主题设置界面顶部提供了保存设置的按钮。 halo-dev/console#549 @Aanko
- 修改后台页面的 lang 属性,由 `zh-cmn-Hans` 改为 `cmn-Han`,`zh-cmn-Hans` 已废弃。 halo-dev/console#576 @wordlesswind
- 优化后台附件库列表以及选择附件弹框的布局。 halo-dev/console#580 @ruibaby
- 修改后台底部的 `Power by Halo` 为 `Powered by Halo`。 halo-dev/console#597 @liaocp666
- 优化后台日志管理设置公开/隐藏状态的方式。 halo-dev/console#610 @zjy4fun @manction
- 优化后台在个人资料中设置头像的逻辑,现在无需再提交个人资料表单。 halo-dev/console#619 @wxyShine
- 优化后台图库批量从附件添加时,按照选择顺序倒序排列,即最先选择的图片在最前面。 halo-dev/console#631 @zjy4fun @zyy247796143

## Bug Fixes

- 修复文章详情页 `meta_description` 为空的问题。 #2282 @guqing @ruibaby
- 修复批量删除外部云存储的时候,因为文件不存在导致的删除失败问题。 #2317 @JustinLiang522 @129duckflew
- 修复了七牛云存储附件无法上传非图片文件的问题。 #2331 @AirboZH @hexWars
- 修复未审核评论回复会发送邮件提醒的问题。 #2340 @AirboZH @cetr
- 修复在单个分类所属文章页面页面变量中无法获取子分类中文章的问题。 #2405 @JustinLiang522 @HugeLeaf
- 修复管理员资料表单中邮件地址的字符数限制。 halo-dev/console#571 @Yhcrown
- 修复了无法设置日志、相册、链接页标题和每页显示条数的问题。 halo-dev/console#601 @JustinLiang522 @manction

## Dependencies

- Docker 镜像的基础镜像使用 Eclipse Temurin 镜像替代 AdoptOpenJDK。 #2120 @wordlesswind
```

#### Does this PR introduce a user-facing change?

```release-note
None
```
f2c-ci-robot bot pushed a commit that referenced this pull request Oct 12, 2022
#### What type of PR is this?
/milestone 1.5.x

#### What this PR does / why we need it:
发布 1.5.5

#### Special notes for your reviewer:
```markdown
## Improvements
- 完善install路径返回的页面结果。#2225 @cetr 

## Bug Fixes
- 修改根据分类查询文章方法,使其同时返回子分类文章。#2405 @JustinLiang522
- 修复七牛云做附件存储时附件无法上传非图片文件的问题。#2331 @AirboZH
- 修复了当云存储中文件被删除时,在 Halo 同时删除多个附件会失败的问题。#2317 @JustinLiang522
- 修复文章详情页 meta_description 内容生成为空的问题。#2282 @guqing 
- 修复了无法设置日志、相册、链接页标题和每页显示条数的问题。halo-dev/console#601 @JustinLiang522
```
/cc @halo-dev/sig-halo 
#### Does this PR introduce a user-facing change?

```release-note
None
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

附件无法上传非图片文件
5 participants