gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: using local time to replace UTC in S3 modify action

Browse Source 
Signed-off-by: xuxihao <xuxihao3@jd.com>
This commit is contained in:
xuxihao 2020-04-16 17:46:41 +08:00
parent d991713ca2
commit 176475a671
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/docker-compose.yml
View File

@ -274,6 +274,8 @@ services:
command: /bin/sh /cfs/script/start.sh
restart: on-failure
privileged: true
environment:
- TZ=Asia/Shanghai
networks:
extnetwork:
ipv4_address: 192.168.0.41
@ -291,6 +293,8 @@ services:
command: /bin/sh /cfs/script/start.sh
restart: on-failure
privileged: true
environment:
- TZ=Asia/Shanghai
networks:
extnetwork:
ipv4_address: 192.168.0.42
@ -308,6 +312,8 @@ services:
command: /bin/sh /cfs/script/start.sh
restart: on-failure
privileged: true
environment:
- TZ=Asia/Shanghai
networks:
extnetwork:
ipv4_address: 192.168.0.43

4
objectnode/api_handler_object.go
View File

@ -665,7 +665,7 @@ func (o *ObjectNode) getBucketV1Handler(w http.ResponseWriter, r *http.Request)
for _, fsFileInfo := range fsFileInfos {
content := &Content{
Key: fsFileInfo.Path,
LastModified: formatTimeISO(fsFileInfo.ModifyTime),
LastModified: formatTimeISOLocal(fsFileInfo.ModifyTime),
ETag: wrapUnescapedQuot(fsFileInfo.ETag),
Size: int(fsFileInfo.Size),
StorageClass: StorageClassStandard,
@ -798,7 +798,7 @@ func (o *ObjectNode) getBucketV2Handler(w http.ResponseWriter, r *http.Request)
for _, fsFileInfo := range fsFileInfos {
content := &Content{
Key: fsFileInfo.Path,
LastModified: formatTimeISO(fsFileInfo.ModifyTime),
LastModified: formatTimeISOLocal(fsFileInfo.ModifyTime),
ETag: wrapUnescapedQuot(fsFileInfo.ETag),
Size: int(fsFileInfo.Size),
StorageClass: StorageClassStandard,

3
objectnode/util.go
View File

@ -135,6 +135,9 @@ func formatSimpleTime(time time.Time) string {
func formatTimeISO(time time.Time) string {
return time.UTC().Format("2006-01-02T15:04:05.000Z")
}
func formatTimeISOLocal(time time.Time) string {
return time.Local().Format("2006-01-02T15:04:05.000Z")
}
func formatTimeRFC1123(time time.Time) string {
return time.UTC().Format(http.TimeFormat)