Browse Source

Merge remote-tracking branch 'origin/V20211115' into zouap

pull/1036/head
zouap 3 years ago
parent
commit
6b032d8c4c
1 changed files with 3 additions and 4 deletions
  1. +3
    -4
      routers/api/v1/repo/repo_dashbord.go

+ 3
- 4
routers/api/v1/repo/repo_dashbord.go View File

@@ -495,12 +495,12 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time,

} else {

beginTime, err = time.Parse("2006-01-02", beginTimeStr)
beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local)
if err != nil {
return now, now, err
}

endTime, err = time.Parse("2006-01-02", endTimeStr)
endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local)
if err != nil {
return now, now, err
}
@@ -520,8 +520,7 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time,
}

func getRecordBeginTime() (time.Time, error) {

return time.Parse(DATE_FORMAT, setting.RadarMap.RecordBeginTime)
return time.ParseInLocation(DATE_FORMAT, setting.RadarMap.RecordBeginTime, time.Local)
}

func getTotalPage(total int64, pageSize int) int {


Loading…
Cancel
Save