The Unified and Autonomous Development Platform
feat: Show timestamp in user timezone (OD-639)
Robin Shen7836ea394d5a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.javaindex 8a9565cf96..5ba7d46244 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateParam.java@@ -5,10 +5,9 @@ import java.util.Map;import javax.validation.Valid;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.Constants;-import io.onedev.server.annotation.Editable;@Editable(order=505, name=ParamSpec.DATE)public class DateParam extends ParamSpec {@@ -51,7 +50,7 @@ public class DateParam extends ParamSpec {@Overridepublic long getOrdinal(String fieldValue) {if (fieldValue != null)- return Constants.DATE_FORMATTER.parseDateTime(fieldValue).toDate().getTime();+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.javaindex 368de9644c..6aa0e7cb77 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/DateTimeParam.java@@ -5,10 +5,9 @@ import java.util.Map;import javax.validation.Valid;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.Constants;-import io.onedev.server.annotation.Editable;@Editable(order=600, name=ParamSpec.DATE_TIME)public class DateTimeParam extends ParamSpec {@@ -51,7 +50,7 @@ public class DateTimeParam extends ParamSpec {@Overridepublic long getOrdinal(String fieldValue) {if (fieldValue != null)- return Constants.DATETIME_FORMATTER.parseDateTime(fieldValue).toDate().getTime();+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.javaindex 52c9326388..564831e11a 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/dateinput/DateInput.java@@ -1,18 +1,16 @@package io.onedev.server.buildspecmodel.inputspec.dateinput;import java.util.ArrayList;+import java.util.Date;import java.util.List;import java.util.Map;import javax.validation.ValidationException;-import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;-import org.joda.time.DateTime;-import com.google.common.collect.Lists;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.util.Constants;+import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;public class DateInput {@@ -32,7 +30,7 @@ public class DateInput {public static Object convertToObject(List<String> strings) {try {if (strings.size() == 1)- return Constants.DATE_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ return new Date(Long.parseLong(strings.iterator().next()));else if (strings.size() == 0)return null;else@@ -44,7 +42,7 @@ public class DateInput {public static List<String> convertToStrings(Object value) {if (value != null)- return Lists.newArrayList(Constants.DATE_FORMATTER.print(new DateTime(value)));+ return Lists.newArrayList(String.valueOf(((Date)value).getTime()));elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.javaindex 7a4660cd3d..b43000876f 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/datetimeinput/DateTimeInput.java@@ -1,18 +1,16 @@package io.onedev.server.buildspecmodel.inputspec.datetimeinput;import java.util.ArrayList;+import java.util.Date;import java.util.List;import java.util.Map;import javax.validation.ValidationException;-import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;-import org.joda.time.DateTime;-import com.google.common.collect.Lists;-import io.onedev.server.util.Constants;+import io.onedev.server.buildspecmodel.inputspec.InputSpec;+import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;public class DateTimeInput {@@ -33,7 +31,7 @@ public class DateTimeInput {public static Object convertToObject(List<String> strings) {try {if (strings.size() == 1)- return Constants.DATETIME_FORMATTER.parseDateTime(strings.iterator().next()).toDate();+ return new Date(Long.parseLong(strings.iterator().next()));else if (strings.size() == 0)return null;else@@ -45,7 +43,7 @@ public class DateTimeInput {public static List<String> convertToStrings(Object value) {if (value != null)- return Lists.newArrayList(Constants.DATETIME_FORMATTER.print(new DateTime(value)));+ return Lists.newArrayList(String.valueOf(((Date)value).getTime()));elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 45fd65f694..d9fa4416b9 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -1,5 +1,8 @@package io.onedev.server.data.migration;+import static io.onedev.server.util.Constants.DATETIME_FORMATTER;+import static io.onedev.server.util.Constants.DATE_FORMATTER;+import static io.onedev.server.util.DateUtils.toLocalDate;import static java.nio.charset.StandardCharsets.UTF_8;import static java.util.Comparator.comparing;import static java.util.Comparator.naturalOrder;@@ -54,6 +57,7 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.markdown.MentionParser;import io.onedev.server.model.Issue;@@ -65,7 +69,6 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.TimeGroups;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.CryptoUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.DirectoryVersionUtils;import io.onedev.server.util.Pair;import io.onedev.server.util.ParsedEmailAddress;@@ -6757,9 +6760,9 @@ public class DataMigrator {if (finishDateElement != null) {var finishDate = parseDate(finishDateElement.getText().trim());var finishTimeGroupsElement = element.addElement("finishTimeGroups");- finishTimeGroupsElement.addElement("day").setText(String.valueOf(DateUtils.toLocalDate(finishDate).toEpochDay()));- finishTimeGroupsElement.addElement("week").setText(String.valueOf(DateUtils.toLocalDate(finishDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));- finishTimeGroupsElement.addElement("month").setText(String.valueOf(DateUtils.toLocalDate(finishDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));+ finishTimeGroupsElement.addElement("day").setText(String.valueOf(toLocalDate(finishDate).toEpochDay()));+ finishTimeGroupsElement.addElement("week").setText(String.valueOf(toLocalDate(finishDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));+ finishTimeGroupsElement.addElement("month").setText(String.valueOf(toLocalDate(finishDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));if (runningDateElement != null)element.addElement("runningDuration").setText(String.valueOf(finishDate.getTime() - parseDate(runningDateElement.getText().trim()).getTime()));}@@ -6772,18 +6775,18 @@ public class DataMigrator {for (Element element : dom.getRootElement().elements()) {var submitDate = parseDate(element.elementText("submitDate").trim());var submitTimeGroupsElement = element.addElement("submitTimeGroups");- submitTimeGroupsElement.addElement("day").setText(String.valueOf(DateUtils.toLocalDate(submitDate).toEpochDay()));- submitTimeGroupsElement.addElement("week").setText(String.valueOf(DateUtils.toLocalDate(submitDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));- submitTimeGroupsElement.addElement("month").setText(String.valueOf(DateUtils.toLocalDate(submitDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));+ submitTimeGroupsElement.addElement("day").setText(String.valueOf(toLocalDate(submitDate).toEpochDay()));+ submitTimeGroupsElement.addElement("week").setText(String.valueOf(toLocalDate(submitDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));+ submitTimeGroupsElement.addElement("month").setText(String.valueOf(toLocalDate(submitDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));if (!element.elementTextTrim("status").equals("OPEN")) {var closeDate = parseDate(element.element("lastActivity").elementText("date").trim());element.addElement("closeDate").addAttribute("class", "sql-timestamp").setText(formatDate(closeDate));element.addElement("duration").setText(String.valueOf(closeDate.getTime() - submitDate.getTime()));var closeTimeGroupsElement = element.addElement("closeTimeGroups");- closeTimeGroupsElement.addElement("day").setText(String.valueOf(DateUtils.toLocalDate(closeDate).toEpochDay()));- closeTimeGroupsElement.addElement("week").setText(String.valueOf(DateUtils.toLocalDate(closeDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));- closeTimeGroupsElement.addElement("month").setText(String.valueOf(DateUtils.toLocalDate(closeDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));+ closeTimeGroupsElement.addElement("day").setText(String.valueOf(toLocalDate(closeDate).toEpochDay()));+ closeTimeGroupsElement.addElement("week").setText(String.valueOf(toLocalDate(closeDate).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));+ closeTimeGroupsElement.addElement("month").setText(String.valueOf(toLocalDate(closeDate).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));}}dom.writeToFile(file, false);@@ -6832,9 +6835,9 @@ public class DataMigrator {historyElement.addElement("state").setText(history.getState());historyElement.addElement("date").addAttribute("class", "sql-timestamp").setText(formatDate(history.getDate()));var timeGroupsElement = historyElement.addElement("timeGroups");- timeGroupsElement.addElement("day").setText(String.valueOf(DateUtils.toLocalDate(history.getDate()).toEpochDay()));- timeGroupsElement.addElement("week").setText(String.valueOf(DateUtils.toLocalDate(history.getDate()).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));- timeGroupsElement.addElement("month").setText(String.valueOf(DateUtils.toLocalDate(history.getDate()).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));+ timeGroupsElement.addElement("day").setText(String.valueOf(toLocalDate(history.getDate()).toEpochDay()));+ timeGroupsElement.addElement("week").setText(String.valueOf(toLocalDate(history.getDate()).with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));+ timeGroupsElement.addElement("month").setText(String.valueOf(toLocalDate(history.getDate()).with(TemporalAdjusters.firstDayOfMonth()).toEpochDay()));if (history.getDuration() != null)historyElement.addElement("duration").setText(history.getDuration().toString());return historyElement;@@ -7024,7 +7027,7 @@ public class DataMigrator {}private void migrate176_timeGroups(Element timeGroupsElement, String dateString) {- var localDate = DateUtils.toLocalDate(parseDate(dateString));+ var localDate = toLocalDate(parseDate(dateString));timeGroupsElement.clearContent();timeGroupsElement.addElement("day").setText(String.valueOf(localDate.toEpochDay()));timeGroupsElement.addElement("week").setText(String.valueOf(localDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay()));@@ -7803,4 +7806,45 @@ public class DataMigrator {}}+ private void migrate198(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("IssueFields.xml") || file.getName().startsWith("BuildParams.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var type = element.elementText("type").trim();+ var valueElement = element.element("value");+ if (valueElement != null) {+ if (type.equals(InputSpec.DATE)) {+ valueElement.setText(String.valueOf(DATE_FORMATTER.parseDateTime(valueElement.getText().trim()).getMillis()));+ } else if (type.equals(InputSpec.DATE_TIME)) {+ valueElement.setText(String.valueOf(DATETIME_FORMATTER.parseDateTime(valueElement.getText().trim()).getMillis()));+ }+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Iterations.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var startDateElement = element.element("startDate");+ if (startDateElement != null) {+ element.addElement("startDay").setText(String.valueOf(toLocalDate(parseDate(startDateElement.getText().trim()), ZoneId.systemDefault()).toEpochDay()));+ startDateElement.detach();+ }+ var dueDateElement = element.element("dueDate");+ if (dueDateElement != null) {+ element.addElement("dueDay").setText(String.valueOf(toLocalDate(parseDate(dueDateElement.getText().trim()), ZoneId.systemDefault()).toEpochDay()));+ dueDateElement.detach();+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("IssueWorks.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ element.element("day").detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueWorkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWorkManager.javaindex bdb7672344..7d5c44e642 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWorkManager.java@@ -1,5 +1,10 @@package io.onedev.server.entitymanager;+import java.util.Date;+import java.util.List;++import javax.annotation.Nullable;+import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWork;import io.onedev.server.model.User;@@ -7,15 +12,12 @@ import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.ProjectScope;-import javax.annotation.Nullable;-import java.util.List;-public interface IssueWorkManager extends EntityManager<IssueWork> {void createOrUpdate(IssueWork work);- List<IssueWork> query(User user, Issue issue, long day);+ List<IssueWork> query(User user, Issue issue, Date fromDate, Date toDate);- List<IssueWork> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery, long fromDay, long toDay);+ List<IssueWork> query(@Nullable ProjectScope projectScope, EntityQuery<Issue> issueQuery, Date fromDate, Date toDate);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.javaindex c278bb5064..964612431d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWorkManager.java@@ -1,5 +1,26 @@package io.onedev.server.entitymanager.impl;+import static io.onedev.server.model.IssueWork.PROP_DATE;+import static io.onedev.server.model.IssueWork.PROP_ISSUE;+import static io.onedev.server.model.IssueWork.PROP_USER;+import static io.onedev.server.model.Project.PROP_TIME_TRACKING;+import static java.util.stream.Collectors.toSet;++import java.util.ArrayList;+import java.util.Date;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;++import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import edu.emory.mathcs.backport.java.util.Arrays;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;@@ -15,22 +36,6 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectScope;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Predicate;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;--import static io.onedev.server.model.IssueWork.*;-import static io.onedev.server.model.Project.PROP_TIME_TRACKING;-import static java.util.stream.Collectors.toSet;@Singletonpublic class DefaultIssueWorkManager extends BaseEntityManager<IssueWork> implements IssueWorkManager {@@ -55,7 +60,7 @@ public class DefaultIssueWorkManager extends BaseEntityManager<IssueWork> implem@SuppressWarnings("unchecked")@Sessional@Override- public List<IssueWork> query(ProjectScope projectScope, EntityQuery<Issue> issueQuery, long fromDay, long toDay) {+ public List<IssueWork> query(ProjectScope projectScope, EntityQuery<Issue> issueQuery, Date fromDate, Date toDate) {var builder = getSession().getCriteriaBuilder();var criteriaQuery = builder.createQuery(IssueWork.class);var root = criteriaQuery.from(IssueWork.class);@@ -68,8 +73,8 @@ public class DefaultIssueWorkManager extends BaseEntityManager<IssueWork> implemJoin<Project, Project> project = issue.join(Issue.PROP_PROJECT, JoinType.INNER);predicates.add(builder.equal(project.get(PROP_TIME_TRACKING), true));- predicates.add(builder.ge(root.get(PROP_DAY), fromDay));- predicates.add(builder.le(root.get(PROP_DAY), toDay));+ predicates.add(builder.greaterThanOrEqualTo(root.get(PROP_DATE), fromDate));+ predicates.add(builder.lessThanOrEqualTo(root.get(PROP_DATE), toDate));criteriaQuery.where(predicates.toArray(new Predicate[0]));List<javax.persistence.criteria.Order> preferOrders = new ArrayList<>();@@ -101,11 +106,12 @@ public class DefaultIssueWorkManager extends BaseEntityManager<IssueWork> implem@Sessional@Override- public List<IssueWork> query(User user, Issue issue, long day) {+ public List<IssueWork> query(User user, Issue issue, Date fromDate, Date toDate) {var criteria = newCriteria();criteria.add(Restrictions.eq(PROP_USER, user));criteria.add(Restrictions.eq(PROP_ISSUE, issue));- criteria.add(Restrictions.eq(PROP_DAY, day));+ criteria.add(Restrictions.ge(PROP_DATE, fromDate));+ criteria.add(Restrictions.le(PROP_DATE, toDate));return query(criteria);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.javaindex e925aa1231..43885d1bf4 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultStopwatchManager.java@@ -1,62 +1,37 @@package io.onedev.server.entitymanager.impl;-import com.google.common.collect.Lists;+import static io.onedev.server.model.Stopwatch.PROP_ISSUE;+import static io.onedev.server.model.Stopwatch.PROP_USER;++import java.util.Date;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;+import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.event.Listen;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.mail.MailManager;import io.onedev.server.entitymanager.IssueWorkManager;-import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.StopwatchManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWork;import io.onedev.server.model.Stopwatch;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.taskschedule.SchedulableTask;-import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.DateUtils;-import org.hibernate.criterion.Restrictions;-import org.quartz.CronScheduleBuilder;-import org.quartz.ScheduleBuilder;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.time.LocalDate;-import java.util.Arrays;-import java.util.Date;-import java.util.HashMap;-import java.util.Map;--import static io.onedev.server.model.Stopwatch.PROP_ISSUE;-import static io.onedev.server.model.Stopwatch.PROP_USER;@Singleton-public class DefaultStopwatchManager extends BaseEntityManager<Stopwatch> implements StopwatchManager, SchedulableTask {+public class DefaultStopwatchManager extends BaseEntityManager<Stopwatch> implements StopwatchManager {private final IssueWorkManager workManager;- private final TaskScheduler taskScheduler;-- private final MailManager mailManager;-- private final SettingManager settingManager;-- private String taskId;-@Inject- public DefaultStopwatchManager(Dao dao, IssueWorkManager workManager, SettingManager settingManager,- TaskScheduler taskScheduler, MailManager mailManager) {+ public DefaultStopwatchManager(Dao dao, IssueWorkManager workManager) {super(dao);this.workManager = workManager;- this.taskScheduler = taskScheduler;- this.mailManager = mailManager;- this.settingManager = settingManager;}@Override@@ -87,14 +62,12 @@ public class DefaultStopwatchManager extends BaseEntityManager<Stopwatch> implem@Transactional@Overridepublic void stopWork(Stopwatch stopwatch) {- stopWork(stopwatch, new Date());- }-- private void stopWork(Stopwatch stopwatch, Date stopDate) {int spentMinutes = (int) ((System.currentTimeMillis() - stopwatch.getDate().getTime()) / 60000);if (spentMinutes > 0) {- var day = DateUtils.toLocalDate(stopwatch.getDate()).toEpochDay();- var works = workManager.query(stopwatch.getUser(), stopwatch.getIssue(), day);+ var localDate = DateUtils.toLocalDate(stopwatch.getDate());+ Date startOfDay = DateUtils.toDate(localDate.atStartOfDay());+ Date endOfDay = DateUtils.toDate(localDate.atTime(23, 59, 59));+ var works = workManager.query(stopwatch.getUser(), stopwatch.getIssue(), startOfDay, endOfDay);works.sort((o1, o2) -> o2.getDate().compareTo(o1.getDate()));IssueWork workWithoutNote = null;for (var work: works) {@@ -105,7 +78,6 @@ public class DefaultStopwatchManager extends BaseEntityManager<Stopwatch> implem}if (workWithoutNote == null) {workWithoutNote = new IssueWork();- workWithoutNote.setDay(day);workWithoutNote.setUser(stopwatch.getUser());workWithoutNote.setIssue(stopwatch.getIssue());workWithoutNote.setDate(new Date());@@ -115,48 +87,5 @@ public class DefaultStopwatchManager extends BaseEntityManager<Stopwatch> implem}dao.remove(stopwatch);}-- @Listen- public void on(SystemStarted event) {- taskId = taskScheduler.schedule(this);- }-- @Listen- public void on(SystemStopping event) {- if (taskId != null)- taskScheduler.unschedule(taskId);- }-- @Transactional- @Override- public void execute() {- var day = DateUtils.toLocalDate(new Date()).toEpochDay();- for (var stopwatch: query(true)) {- var startDay = DateUtils.toLocalDate(stopwatch.getDate()).toEpochDay();- if (startDay < day) {- stopWork(stopwatch, DateUtils.toDate(LocalDate.ofEpochDay(startDay).atTime(23, 59)));-- Map<String, Object> bindings = new HashMap<>();- bindings.put("stopwatch", stopwatch);-- var template = settingManager.getEmailTemplates().getStopwatchOverdue();- var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);- var textBody = EmailTemplates.evalTemplate(false, template, bindings);-- var emailAddress = stopwatch.getUser().getPrimaryEmailAddress();- if (emailAddress != null && emailAddress.isVerified()) {- mailManager.sendMail(Arrays.asList(emailAddress.getValue()),- Lists.newArrayList(), Lists.newArrayList(),- "[Stopwatch Overdue] Your Issue Stopwatch is Overdue",- htmlBody, textBody, null, null, null);- }- }- }- }-- @Override- public ScheduleBuilder<?> getScheduleBuilder() {- return CronScheduleBuilder.cronSchedule("0 0 * * * ?");- }-+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/IssueWork.java b/server-core/src/main/java/io/onedev/server/model/IssueWork.javaindex 3d1f95139e..847dc6a097 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueWork.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueWork.java@@ -1,22 +1,28 @@package io.onedev.server.model;-import com.fasterxml.jackson.annotation.JsonIgnore;-import com.fasterxml.jackson.annotation.JsonProperty;-import io.onedev.server.rest.annotation.Immutable;+import static io.onedev.server.model.IssueWork.PROP_DATE;++import java.util.Date;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;-import javax.annotation.Nullable;-import javax.persistence.*;-import java.util.Date;+import com.fasterxml.jackson.annotation.JsonProperty;-import static io.onedev.server.model.IssueWork.PROP_DATE;-import static io.onedev.server.model.IssueWork.PROP_DAY;+import io.onedev.server.rest.annotation.Immutable;@Entity-@Table(indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id"),- @Index(columnList=PROP_DATE), @Index(columnList = PROP_DAY)})+@Table(indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id"), @Index(columnList=PROP_DATE)})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class IssueWork extends AbstractEntity {@@ -29,9 +35,7 @@ public class IssueWork extends AbstractEntity {public static final String PROP_ISSUE = "issue";public static final String PROP_DATE = "date";-- public static final String PROP_DAY = "day";-+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)@Immutable@@ -45,10 +49,7 @@ public class IssueWork extends AbstractEntity {@JsonProperty(access = JsonProperty.Access.READ_ONLY)@Column(nullable = false)private Date date = new Date();-- @JsonIgnore- private long day;-+private int minutes;@Column(length=MAX_CONTENT_LEN)@@ -78,14 +79,6 @@ public class IssueWork extends AbstractEntity {this.date = date;}- public long getDay() {- return day;- }-- public void setDay(long day) {- this.day = day;- }-public int getMinutes() {return minutes;}diff --git a/server-core/src/main/java/io/onedev/server/model/Iteration.java b/server-core/src/main/java/io/onedev/server/model/Iteration.javaindex 7c3fa58b31..5c165d1a5c 100644--- a/server-core/src/main/java/io/onedev/server/model/Iteration.java+++ b/server-core/src/main/java/io/onedev/server/model/Iteration.java@@ -25,9 +25,9 @@ public class Iteration extends AbstractEntity {public static final String PROP_NAME = "name";- public static final String PROP_START_DATE = "startDate";+ public static final String PROP_START_DAY = "startDay";- public static final String PROP_DUE_DATE = "dueDate";+ public static final String PROP_DUE_DAY = "dueDay";public static final String PROP_CLOSED = "closed";@@ -42,9 +42,9 @@ public class Iteration extends AbstractEntity {@Column(length=MAX_DESCRIPTION_LEN)private String description;- private Date startDate;+ private Long startDay;- private Date dueDate;+ private Long dueDay;private boolean closed;@@ -76,21 +76,21 @@ public class Iteration extends AbstractEntity {}@Nullable- public Date getStartDate() {- return startDate;+ public Long getStartDay() {+ return startDay;}- public void setStartDate(Date startDate) {- this.startDate = startDate;+ public void setStartDay(Long startDay) {+ this.startDay = startDay;}@Nullable- public Date getDueDate() {- return dueDate;+ public Long getDueDay() {+ return dueDay;}- public void setDueDate(Date dueDate) {- this.dueDate = dueDate;+ public void setDueDay(Long dueDay) {+ this.dueDay = dueDay;}public boolean isClosed() {@@ -150,22 +150,22 @@ public class Iteration extends AbstractEntity {@Overridepublic int compare(Iteration o1, Iteration o2) {- if (o1.getStartDate() != null) {- if (o2.getStartDate() != null)- return o1.getStartDate().compareTo(o2.getStartDate());+ if (o1.getStartDay() != null) {+ if (o2.getStartDay() != null)+ return o1.getStartDay().compareTo(o2.getStartDay());elsereturn -1;} else {- if (o2.getStartDate() != null) {+ if (o2.getStartDay() != null) {return 1;} else {- if (o1.getDueDate() != null) {- if (o2.getDueDate() != null)- return o1.getDueDate().compareTo(o2.getDueDate());+ if (o1.getDueDay() != null) {+ if (o2.getDueDay() != null)+ return o1.getDueDay().compareTo(o2.getDueDay());elsereturn -1;} else {- if (o2.getDueDate() != null)+ if (o2.getDueDay() != null)return 1;elsereturn o1.getName().compareTo(o2.getName());diff --git a/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.javaindex 110235a8be..b5a4aa6883 100644--- a/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java+++ b/server-core/src/main/java/io/onedev/server/model/support/TimeGroups.java@@ -1,13 +1,15 @@package io.onedev.server.model.support;-import io.onedev.server.util.DateUtils;--import javax.persistence.Embeddable;import java.io.Serializable;import java.time.DayOfWeek;+import java.time.ZoneId;import java.time.temporal.TemporalAdjusters;import java.util.Date;+import javax.persistence.Embeddable;++import io.onedev.server.util.DateUtils;+@Embeddablepublic class TimeGroups implements Serializable {@@ -51,7 +53,7 @@ public class TimeGroups implements Serializable {public static TimeGroups of(Date date) {var timeGroups = new TimeGroups();- var localDate = DateUtils.toLocalDate(date);+ var localDate = DateUtils.toLocalDate(date, ZoneId.systemDefault());timeGroups.setMonth((int) localDate.with(TemporalAdjusters.firstDayOfMonth()).toEpochDay());timeGroups.setWeek((int) localDate.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)).toEpochDay());timeGroups.setDay((int) localDate.toEpochDay());diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.javaindex 22d5a97d5f..909c3d6302 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateField.java@@ -5,10 +5,9 @@ import java.util.Map;import javax.validation.Valid;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.dateinput.DateInput;import io.onedev.server.buildspecmodel.inputspec.dateinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.Constants;-import io.onedev.server.annotation.Editable;@Editable(order=505, name=FieldSpec.DATE)public class DateField extends FieldSpec {@@ -51,7 +50,7 @@ public class DateField extends FieldSpec {@Overridepublic long getOrdinal(String fieldValue) {if (fieldValue != null)- return Constants.DATE_FORMATTER.parseDateTime(fieldValue).toDate().getTime();+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.javaindex c74e805885..65027654cc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/DateTimeField.java@@ -5,10 +5,9 @@ import java.util.Map;import javax.validation.Valid;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.DateTimeInput;import io.onedev.server.buildspecmodel.inputspec.datetimeinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.Constants;-import io.onedev.server.annotation.Editable;@Editable(order=600, name=FieldSpec.DATE_TIME)public class DateTimeField extends FieldSpec {@@ -51,7 +50,7 @@ public class DateTimeField extends FieldSpec {@Overridepublic long getOrdinal(String fieldValue) {if (fieldValue != null)- return Constants.DATETIME_FORMATTER.parseDateTime(fieldValue).toDate().getTime();+ return Long.parseLong(fieldValue);elsereturn super.getOrdinal(fieldValue);}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.javaindex 7bc726a184..fe61491626 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java@@ -1,21 +1,27 @@package io.onedev.server.rest.resource;-import io.onedev.server.SubscriptionManager;-import io.onedev.server.entitymanager.IssueWorkManager;-import io.onedev.server.model.IssueWork;-import io.onedev.server.rest.annotation.Api;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;-import org.apache.shiro.authz.UnauthorizedException;+import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.constraints.NotNull;-import javax.ws.rs.*;+import javax.ws.rs.Consumes;+import javax.ws.rs.DELETE;+import javax.ws.rs.GET;+import javax.ws.rs.POST;+import javax.ws.rs.Path;+import javax.ws.rs.PathParam;+import javax.ws.rs.Produces;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-import static io.onedev.server.security.SecurityUtils.*;+import org.apache.shiro.authz.UnauthorizedException;++import io.onedev.server.SubscriptionManager;+import io.onedev.server.entitymanager.IssueWorkManager;+import io.onedev.server.model.IssueWork;+import io.onedev.server.rest.annotation.Api;+import io.onedev.server.security.SecurityUtils;@Api(order=2250)@Path("/issue-works")@@ -58,8 +64,6 @@ public class IssueWorkResource {|| !SecurityUtils.isAdministrator() && !work.getUser().equals(SecurityUtils.getAuthUser())) {throw new UnauthorizedException();}-- work.setDay(DateUtils.toLocalDate(work.getDate()).toEpochDay());workManager.createOrUpdate(work);return work.getId();@@ -71,8 +75,7 @@ public class IssueWorkResource {public Response update(@PathParam("workId") Long workId, @NotNull IssueWork work) {if (!canModifyOrDelete(work))throw new UnauthorizedException();-- work.setDay(DateUtils.toLocalDate(work.getDate()).toEpochDay());+workManager.createOrUpdate(work);return Response.ok().build();diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 3cd3aa31e5..c765137e7c 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@ -1,5 +1,9 @@package io.onedev.server.rest.resource;+import static io.onedev.server.util.DateUtils.parseISO8601Date;+import static io.onedev.server.util.DateUtils.toLocalDate;+import static java.time.ZoneId.systemDefault;+import java.io.Serializable;import java.time.LocalDate;import java.util.ArrayList;@@ -212,13 +216,13 @@ public class ProjectResource {if (name != null)criteria.add(Restrictions.ilike(Iteration.PROP_NAME, name.replace('%', '*')));if (startBefore != null)- criteria.add(Restrictions.le(Iteration.PROP_START_DATE, DateUtils.parseISO8601Date(startBefore)));+ criteria.add(Restrictions.le(Iteration.PROP_START_DAY, toLocalDate(parseISO8601Date(startBefore), systemDefault()).toEpochDay()));if (startAfter != null)- criteria.add(Restrictions.ge(Iteration.PROP_START_DATE, DateUtils.parseISO8601Date(startAfter)));+ criteria.add(Restrictions.ge(Iteration.PROP_START_DAY, toLocalDate(parseISO8601Date(startAfter), systemDefault()).toEpochDay()));if (dueBefore != null)- criteria.add(Restrictions.le(Iteration.PROP_DUE_DATE, DateUtils.parseISO8601Date(dueBefore)));+ criteria.add(Restrictions.le(Iteration.PROP_DUE_DAY, toLocalDate(parseISO8601Date(dueBefore), systemDefault()).toEpochDay()));if (dueAfter != null)- criteria.add(Restrictions.ge(Iteration.PROP_DUE_DATE, DateUtils.parseISO8601Date(dueAfter)));+ criteria.add(Restrictions.ge(Iteration.PROP_DUE_DAY, toLocalDate(parseISO8601Date(dueAfter), systemDefault()).toEpochDay()));if (closed != null)criteria.add(Restrictions.eq(Iteration.PROP_CLOSED, closed));diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.javaindex 7444f05371..4d381835b6 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java@@ -32,7 +32,7 @@ public class AfterCriteria extends CommitCriteria {@Overridepublic void fill(Project project, RevListOptions options) {for (String value: values)- options.after(value);+ options.after(DateUtils.formatISO8601Date(DateUtils.parseRelaxed(value)));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.javaindex 1ca690eaf5..af1875539d 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java@@ -32,7 +32,7 @@ public class BeforeCriteria extends CommitCriteria {@Overridepublic void fill(Project project, RevListOptions options) {for (String value: values)- options.before(value);+ options.before(DateUtils.formatISO8601Date(DateUtils.parseRelaxed(value)));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex ba2e1151cf..d950a2c69d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -146,7 +146,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializathrow new ExplicitException("Unrecognized date: " + value);return dateValue;}-+public static ProjectScopedCommit getCommitId(@Nullable Project project, String value) {if (project != null && !value.contains(":"))value = project.getPath() + ":" + value;diff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/DateUtils.javaindex bcceb5db25..a832176bf1 100644--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/DateUtils.java@@ -1,19 +1,26 @@package io.onedev.server.util;-import com.google.common.collect.Lists;-import com.joestelmach.natty.DateGroup;-import com.joestelmach.natty.Parser;-import io.onedev.k8shelper.KubernetesHelper;-import org.joda.time.DateTime;-import org.joda.time.format.ISODateTimeFormat;-import org.ocpsoft.prettytime.PrettyTime;--import javax.annotation.Nullable;import java.time.LocalDate;import java.time.LocalDateTime;import java.time.ZoneId;import java.util.Date;import java.util.List;+import java.util.TimeZone;++import javax.annotation.Nullable;++import org.apache.wicket.request.cycle.RequestCycle;+import org.joda.time.DateTime;+import org.joda.time.DateTimeZone;+import org.joda.time.format.ISODateTimeFormat;+import org.ocpsoft.prettytime.PrettyTime;++import com.google.common.collect.Lists;+import com.joestelmach.natty.DateGroup;+import com.joestelmach.natty.Parser;++import io.onedev.k8shelper.KubernetesHelper;+import io.onedev.server.web.WebSession;public class DateUtils extends org.apache.commons.lang3.time.DateUtils {@@ -28,24 +35,48 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {return PRETTY_TIME.format(date);}+ public static ZoneId getZoneId() {+ if (RequestCycle.get() != null) {+ ZoneId zoneId = WebSession.get().getZoneId();+ if (zoneId == null)+ zoneId = ZoneId.systemDefault();+ return zoneId;+ } else {+ return ZoneId.systemDefault();+ }+ }++ public static String formatDate(Date date, ZoneId zoneId) {+ return Constants.DATE_FORMATTER.withZone(DateTimeZone.forID(zoneId.getId())).print(new DateTime(date));+ }+public static String formatDate(Date date) {- return Constants.DATE_FORMATTER.print(new DateTime(date));+ return formatDate(date, getZoneId());+ }++ public static String formatDateTime(Date date, ZoneId zoneId) {+ return Constants.DATETIME_FORMATTER.withZone(DateTimeZone.forID(zoneId.getId())).print(new DateTime(date));}public static String formatDateTime(Date date) {- return Constants.DATETIME_FORMATTER.print(new DateTime(date));+ return formatDateTime(date, getZoneId());}@Nullable- public static Date parseRelaxed(String relaxed) {- Parser parser = new Parser();+ public static Date parseRelaxed(String relaxed, ZoneId zoneId) {+ Parser parser = new Parser(TimeZone.getTimeZone(zoneId.getId()));List<DateGroup> groups = parser.parse(relaxed);if (!groups.isEmpty() && !groups.get(0).getDates().isEmpty())return groups.get(0).getDates().get(0);elsereturn null;}-++ @Nullable+ public static Date parseRelaxed(String relaxed) {+ return parseRelaxed(relaxed, getZoneId());+ }+public static String formatDuration(long durationMillis) {return KubernetesHelper.formatDuration(durationMillis);}@@ -58,12 +89,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {return ISODateTimeFormat.dateTime().print(date.getTime());}+ public static LocalDate toLocalDate(Date date, ZoneId zoneId) {+ return date.toInstant().atZone(zoneId).toLocalDate();+ }+public static LocalDate toLocalDate(Date date) {- return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();+ return toLocalDate(date, getZoneId());}- public static Date toDate(LocalDateTime localDateTime) {- return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());+ public static Date toDate(LocalDateTime localDateTime, ZoneId zoneId) {+ return Date.from(localDateTime.atZone(zoneId).toInstant());}-}\ No newline at end of file+ public static Date toDate(LocalDateTime localDateTime) {+ return toDate(localDateTime, getZoneId());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/IterationSort.java b/server-core/src/main/java/io/onedev/server/util/IterationSort.javaindex 8d97fdc6e5..ba8110eacc 100644--- a/server-core/src/main/java/io/onedev/server/util/IterationSort.java+++ b/server-core/src/main/java/io/onedev/server/util/IterationSort.java@@ -10,7 +10,7 @@ public enum IterationSort {@Overridepublic Order getOrder(boolean closed) {- return closed?Order.desc(Iteration.PROP_DUE_DATE):Order.asc(Iteration.PROP_DUE_DATE);+ return closed?Order.desc(Iteration.PROP_DUE_DAY):Order.asc(Iteration.PROP_DUE_DAY);}},@@ -18,7 +18,7 @@ public enum IterationSort {@Overridepublic Order getOrder(boolean closed) {- return closed?Order.asc(Iteration.PROP_DUE_DATE):Order.desc(Iteration.PROP_DUE_DATE);+ return closed?Order.asc(Iteration.PROP_DUE_DAY):Order.desc(Iteration.PROP_DUE_DAY);}},diff --git a/server-core/src/main/java/io/onedev/server/util/ZoneIdChanged b/server-core/src/main/java/io/onedev/server/util/ZoneIdChangednew file mode 100644index 0000000000..e69de29bb2diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.javaindex bac315d6ed..cb284b4a62 100644--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java@@ -1,5 +1,6 @@package io.onedev.server.web;+import java.time.ZoneId;import java.util.Map;import java.util.Set;import java.util.concurrent.ConcurrentHashMap;@@ -7,7 +8,6 @@ import java.util.concurrent.ConcurrentHashMap;import javax.annotation.Nullable;import javax.servlet.http.HttpSession;-import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;import org.apache.shiro.SecurityUtils;import org.apache.shiro.authc.AuthenticationToken;import org.apache.shiro.subject.Subject;@@ -16,6 +16,7 @@ import org.apache.wicket.request.Request;import org.apache.wicket.util.collections.ConcurrentHashSet;import io.onedev.server.OneDev;+import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;import io.onedev.server.web.util.Cursor;public class WebSession extends org.apache.wicket.protocol.http.WebSession {@@ -29,6 +30,8 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {private volatile Cursor packCursor;private volatile Cursor pullRequestCursor;++ private volatile ZoneId zoneId;private Map<Class<?>, String> redirectUrlsAfterDelete = new ConcurrentHashMap<>();@@ -108,6 +111,15 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {return expandedProjectIds;}+ @Nullable+ public ZoneId getZoneId() {+ return zoneId;+ }++ public void setZoneId(@Nullable ZoneId zoneId) {+ this.zoneId = zoneId;+ }+public static WebSession from(HttpSession session) {String attributeName = "wicket:" + OneDev.getInstance(WicketServlet.class).getServletName() + ":session";return (WebSession) session.getAttribute(attributeName);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ZoneIdBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ZoneIdBehavior.javanew file mode 100644index 0000000000..6d60cf37ee--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ZoneIdBehavior.java@@ -0,0 +1,14 @@+package io.onedev.server.web.behavior;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.Behavior;++public class ZoneIdBehavior extends Behavior {++ @Override+ public void bind(Component component) {+ super.bind(component);+ component.setOutputMarkupId(true);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.javaindex 166b27d0a4..9a26556478 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/ParamValuesLabel.java@@ -1,11 +1,14 @@package io.onedev.server.web.component.build;+import java.util.Date;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.Model;import io.onedev.commons.utils.StringUtils;import io.onedev.server.buildspec.param.spec.ParamSpec;import io.onedev.server.buildspecmodel.inputspec.SecretInput;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;public class ParamValuesLabel extends Label {@@ -15,11 +18,15 @@ public class ParamValuesLabel extends Label {if (param.getType().equals(ParamSpec.SECRET)) {setDefaultModel(Model.of(SecretInput.MASK));- } else if (!param.getValues().isEmpty()) {- setDefaultModel(Model.of(StringUtils.join(param.getValues(), ",")));- } else {+ } else if (param.getValues().isEmpty()) {setDefaultModel(Model.of("<i>Unspecified</i>"));setEscapeModelStrings(false);+ } else if (param.getType().equals(ParamSpec.DATE)) {+ setDefaultModel(Model.of(DateUtils.formatDate(new Date(Long.parseLong(param.getValues().iterator().next())))));+ } else if (param.getType().equals(ParamSpec.DATE_TIME)) {+ setDefaultModel(Model.of(DateUtils.formatDateTime(new Date(Long.parseLong(param.getValues().iterator().next())))));+ } else {+ setDefaultModel(Model.of(StringUtils.join(param.getValues(), ",")));}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex d40f009179..c2f7372964 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -45,6 +45,7 @@ import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevObject;import org.joda.time.DateTime;+import org.joda.time.DateTimeZone;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -69,6 +70,7 @@ import io.onedev.server.search.commit.MessageCriteria;import io.onedev.server.search.commit.PathCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectAndRevision;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.behavior.CommitQueryBehavior;@@ -115,7 +117,7 @@ public abstract class CommitListPanel extends Panel {List<RevCommit> separated = new ArrayList<>();DateTime groupTime = null;for (RevCommit commit: commits) {- DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen());+ DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen()).withZone(DateTimeZone.forID(DateUtils.getZoneId().getId()));if (groupTime == null || commitTime.getYear() != groupTime.getYear()|| commitTime.getDayOfYear() != groupTime.getDayOfYear()) {groupTime = commitTime;@@ -716,7 +718,7 @@ public abstract class CommitListPanel extends Panel {} else {item = new Fragment(itemId, "dateFrag", this);DateTime dateTime = new DateTime(current.get(index+1).getCommitterIdent().getWhen());- item.add(new Label("date", Constants.DATE_FORMATTER.print(dateTime)));+ item.add(new Label("date", Constants.DATE_FORMATTER.withZone(DateTimeZone.forID(DateUtils.getZoneId().getId())).print(dateTime)));item.add(AttributeAppender.append("class", "date"));}item.setOutputMarkupId(true);diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.javaindex 71ff492e5c..b6ec368fe2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java@@ -1,6 +1,10 @@package io.onedev.server.web.component.datepicker;+import java.text.DateFormat;+import java.text.SimpleDateFormat;import java.util.Date;+import java.util.Locale;+import java.util.TimeZone;import org.apache.wicket.extensions.markup.html.form.DateTextField;import org.apache.wicket.markup.head.CssHeaderItem;@@ -8,8 +12,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.model.IModel;+import org.apache.wicket.util.convert.IConverter;+import org.apache.wicket.util.convert.converter.DateConverter;import io.onedev.server.util.Constants;+import io.onedev.server.util.DateUtils;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BasePage;@@ -18,16 +25,35 @@ public class DatePicker extends DateTextField {private static final long serialVersionUID = 1L;private final boolean withTime;++ private final DateConverter dateConverter;public DatePicker(String id, boolean withTime) {this(id, null, withTime);}public DatePicker(String id, IModel<Date> model, boolean withTime) {- super(id, model, withTime?Constants.DATETIME_FORMAT: Constants.DATE_FORMAT);+ super(id, model, getDatePattern(withTime));this.withTime = withTime;+ dateConverter = new DateConverter() {++ @Override+ public DateFormat getDateFormat(Locale locale) {+ if (locale == null) {+ locale = Locale.getDefault(Locale.Category.FORMAT);+ }+ var dateFormat = new SimpleDateFormat(getDatePattern(withTime), locale);+ dateFormat.setTimeZone(TimeZone.getTimeZone(DateUtils.getZoneId()));+ return dateFormat;+ }++ };}+ private static String getDatePattern(boolean withTime) {+ return withTime?Constants.DATETIME_FORMAT: Constants.DATE_FORMAT;+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -44,4 +70,9 @@ public class DatePicker extends DateTextField {response.render(OnDomReadyHeaderItem.forScript(script));}+ @Override+ protected IConverter<?> createConverter(Class<?> type) {+ return dateConverter;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex fe4b8aad8a..b36a57159d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -116,7 +116,6 @@ class IssueWorkPanel extends Panel {var work = getWork();work.setNote(bean.getNote());work.setDate(bean.getStartAt());- work.setDay(DateUtils.toLocalDate(bean.getStartAt()).toEpochDay());work.setMinutes(bean.getSpentTime());getWorkManager().createOrUpdate(work);var detailViewer = newDetailViewer("body");diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 5689270a0e..0b36019b57 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -1,13 +1,52 @@package io.onedev.server.web.component.issue.fieldvalues;+import java.io.Serializable;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;+import org.unbescape.html.HtmlEscape;+import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.InputContext;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.buildspecmodel.inputspec.SecretInput;import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IterationManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.model.*;+import io.onedev.server.model.Build;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -16,6 +55,7 @@ import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.Input;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;@@ -37,31 +77,6 @@ import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.ProjectAware;-import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;-import java.io.Serializable;-import java.util.Collection;-import java.util.HashMap;-import java.util.List;-import java.util.Map;public abstract class FieldValuesPanel extends Panel implements EditContext, ProjectAware {@@ -238,7 +253,11 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Profor (String value: getField().getValues()) {WebMarkupContainer valueContainer = new WebMarkupContainer(valuesView.newChildId());valuesView.add(valueContainer);- if (getField().getType().equals(FieldSpec.USER)) {+ if (getField().getType().equals(FieldSpec.DATE)) {+ valueContainer.add(new Label("value", DateUtils.formatDate(new Date(Long.parseLong(value)))));+ } else if (getField().getType().equals(FieldSpec.DATE_TIME)) {+ valueContainer.add(new Label("value", DateUtils.formatDateTime(new Date(Long.parseLong(value)))));+ } else if (getField().getType().equals(FieldSpec.USER)) {User user = OneDev.getInstance(UserManager.class).findByName(value);if (user != null)valueContainer.add(new UserIdentPanel("value", user, userFieldDisplayMode));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.javaindex 757b64d23c..94451d5e3b 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java@@ -1,6 +1,17 @@package io.onedev.server.web.component.issue.progress;+import org.apache.wicket.Component;+import org.apache.wicket.Page;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueWorkManager;@@ -11,19 +22,9 @@ import io.onedev.server.model.IssueWork;import io.onedev.server.model.Stopwatch;import io.onedev.server.security.SecurityUtils;import io.onedev.server.timetracking.TimeTrackingManager;-import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.util.editbean.IssueWorkBean;-import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;abstract class TimingDetailPanel extends Panel {@@ -128,7 +129,6 @@ abstract class TimingDetailPanel extends Panel {work.setUser(SecurityUtils.getAuthUser());work.setMinutes(bean.getSpentTime());work.setDate(bean.getStartAt());- work.setDay(DateUtils.toLocalDate(bean.getStartAt()).toEpochDay());work.setNote(bean.getNote());OneDev.getInstance(IssueWorkManager.class).createOrUpdate(work);notifyObservablesChange(target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.javaindex fc3928e6c7..4e732b9353 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/IterationDateLabel.java@@ -1,6 +1,10 @@package io.onedev.server.web.component.iteration;-import java.util.Date;+import static io.onedev.server.util.DateUtils.formatDate;+import static io.onedev.server.util.DateUtils.toDate;+import static java.time.LocalDate.ofEpochDay;++import java.time.LocalDate;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;@@ -8,7 +12,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.Iteration;-import io.onedev.server.util.DateUtils;import io.onedev.server.web.component.svg.SpriteImage;public class IterationDateLabel extends Label {@@ -22,15 +25,15 @@ public class IterationDateLabel extends Label {protected String load() {String arrow = "<svg class='icon'><use xlink:href='" + SpriteImage.getVersionedHref("arrow3") + "'/></svg>";Iteration iteration = iterationIModel.getObject();- if (iteration.getStartDate() != null && iteration.getDueDate() != null) {+ if (iteration.getStartDay() != null && iteration.getDueDay() != null) {return ""- + "<span title='Start date'>" + DateUtils.formatDate(iteration.getStartDate()) + "</span>"+ + "<span title='Start date'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span>"+ " " + arrow + " "- + "<span title='Due date'>" + DateUtils.formatDate(iteration.getDueDate()) + "</span>";- } else if (iteration.getStartDate() != null) {- return "<span title='Start date'>" + DateUtils.formatDate(iteration.getStartDate()) + "</span> " + arrow;- } else if (iteration.getDueDate() != null) {- return arrow + " <span title='Due date'>" + DateUtils.formatDate(iteration.getDueDate()) + "</span>";+ + "<span title='Due date'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";+ } else if (iteration.getStartDay() != null) {+ return "<span title='Start date'>" + formatDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay())) + "</span> " + arrow;+ } else if (iteration.getDueDay() != null) {+ return arrow + " <span title='Due date'>" + formatDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay())) + "</span>";} else {return "<i> No start/due date</i>";}@@ -56,21 +59,21 @@ public class IterationDateLabel extends Label {protected String load() {Iteration iteration = iterationIModel.getObject();if (!iteration.isClosed()) {- Date now = new Date();- if (iteration.getStartDate() != null && iteration.getDueDate() != null) {- if (now.before(iteration.getStartDate()))+ var today = LocalDate.now().toEpochDay();+ if (iteration.getStartDay() != null && iteration.getDueDay() != null) {+ if (today < iteration.getStartDay())return "";- else if (now.after(iteration.getStartDate()) && now.before(iteration.getDueDate()))+ else if (today >= iteration.getStartDay() && today < iteration.getDueDay())return "text-warning";elsereturn "text-danger";- } else if (iteration.getStartDate() != null) {- if (now.before(iteration.getStartDate()))+ } else if (iteration.getStartDay() != null) {+ if (today < iteration.getStartDay())return "";elsereturn "text-warning";- } else if (iteration.getDueDate() != null) {- if (now.before(iteration.getDueDate()))+ } else if (iteration.getDueDay() != null) {+ if (today < iteration.getDueDay())return "";elsereturn "text-danger";diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.javaindex ad64bea011..190873337c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.java@@ -1,5 +1,28 @@package io.onedev.server.web.component.iteration.burndown;+import static io.onedev.server.util.DateUtils.toLocalDate;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.ESTIMATED_TIME;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.ISSUE_COUNT;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.REMAINING_TIME;+import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.getDefault;++import java.time.LocalDate;+import java.time.ZoneId;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;@@ -11,19 +34,6 @@ import io.onedev.server.web.component.chart.line.Line;import io.onedev.server.web.component.chart.line.LineChartPanel;import io.onedev.server.web.component.chart.line.LineSeries;import io.onedev.server.xodus.IssueInfoManager;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;--import javax.annotation.Nullable;-import java.time.LocalDate;-import java.util.*;--import static io.onedev.server.util.DateUtils.toLocalDate;-import static io.onedev.server.web.component.iteration.burndown.BurndownIndicators.*;public class IterationBurndownPanel extends GenericPanel<Iteration> {@@ -45,11 +55,9 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {super.onInitialize();String message = null;- if (getIteration().getStartDate() != null && getIteration().getDueDate() != null) {- if (getIteration().getStartDate().before(getIteration().getDueDate())) {- long startDay = toLocalDate(getIteration().getStartDate()).toEpochDay();- long dueDay = toLocalDate(getIteration().getDueDate()).toEpochDay();- if (dueDay - startDay >= MAX_DAYS)+ if (getIteration().getStartDay() != null && getIteration().getDueDay() != null) {+ if (getIteration().getStartDay() < getIteration().getDueDay()) {+ if (getIteration().getDueDay() - getIteration().getStartDay() >= MAX_DAYS)message = "Iteration spans too long to show burndown chart";} else {message = "Iteration start date should be before due date";@@ -67,21 +75,18 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {@Overrideprotected LineSeries load() {- long startDay = toLocalDate(getIteration().getStartDate()).toEpochDay();- long dueDay = toLocalDate(getIteration().getDueDate()).toEpochDay();-Map<Long, Map<String, Integer>> dailyStateMetrics = new LinkedHashMap<>();for (IssueSchedule schedule : getIteration().getSchedules()) {Issue issue = schedule.getIssue();- long scheduleDay = toLocalDate(schedule.getDate()).toEpochDay();+ long scheduleDay = toLocalDate(schedule.getDate(), ZoneId.systemDefault()).toEpochDay();Map<Long, Integer> dailyMetrics = new HashMap<>();var issueInfoManager = OneDev.getInstance(IssueInfoManager.class);- var fromDay = Math.max(startDay, scheduleDay);- var dailyStates = issueInfoManager.getDailyStates(issue, fromDay, dueDay);+ var fromDay = Math.max(getIteration().getStartDay(), scheduleDay);+ var dailyStates = issueInfoManager.getDailyStates(issue, fromDay, getIteration().getDueDay());if (getIndicator().equals(REMAINING_TIME)) {var estimatedTime = issue.getOwnEstimatedTime();- for (var entry: issueInfoManager.getDailySpentTimes(issue, fromDay, dueDay).entrySet())+ for (var entry: issueInfoManager.getDailySpentTimes(issue, fromDay, getIteration().getDueDay()).entrySet())dailyMetrics.put(entry.getKey(), estimatedTime - entry.getValue());} else {int metric = getIndicatorValue(issue);@@ -109,7 +114,7 @@ public class IterationBurndownPanel extends GenericPanel<Iteration> {List<Line> lines = new ArrayList<>();int initialIssueMetric = 0;- long today = LocalDate.now().toEpochDay();+ var today = LocalDate.now().toEpochDay();for (StateSpec spec : OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpecs()) {List<Integer> yAxisValues = new ArrayList<>();for (Map.Entry<Long, Map<String, Integer>> entry : dailyStateMetrics.entrySet()) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 481e233951..ecd0532083 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -7,6 +7,7 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.File;import java.io.Serializable;+import java.time.ZoneId;import java.util.Collection;import java.util.HashSet;import java.util.List;@@ -20,6 +21,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.apache.wicket.Component;import org.apache.wicket.MetaDataKey;import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -65,10 +67,12 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.CryptoUtils;+import io.onedev.server.web.WebSession;import io.onedev.server.web.asset.icon.IconScope;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;+import io.onedev.server.web.behavior.ZoneIdBehavior;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.admin.ssosetting.SsoProcessPage;@@ -92,13 +96,15 @@ public abstract class BasePage extends WebPage {private FeedbackPanel sessionFeedback;private RepeatingView rootComponents;++ private AbstractDefaultAjaxBehavior zoneIdDetectBehavior;public BasePage(PageParameters params) {super(params);checkReady();- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie(COOKIE_DARK_MODE);+ var request = (WebRequest) RequestCycle.get().getRequest();+ var cookie = request.getCookie(COOKIE_DARK_MODE);if (cookie != null)darkMode = cookie.getValue().equals("yes");else@@ -295,6 +301,25 @@ public abstract class BasePage extends WebPage {});+ add(zoneIdDetectBehavior = new AbstractDefaultAjaxBehavior() {++ @Override+ protected void respond(AjaxRequestTarget target) {+ var zoneId = ZoneId.of(RequestCycle.get().getRequest().getRequestParameters().getParameterValue("timezone").toString());+ WebSession.get().setZoneId(zoneId);+ if (!zoneId.equals(ZoneId.systemDefault())) {+ visitChildren(Component.class, (IVisitor<Component, Void>) (object, visit) -> {+ if (!object.getBehaviors(ZoneIdBehavior.class).isEmpty()) {+ target.add(object);+ visit.dontGoDeeper();+ }++ });++ }+ }++ });}public void notifyObservablesChange(IPartialPageRequestHandler handler, Collection<String> observables) {@@ -341,6 +366,18 @@ public abstract class BasePage extends WebPage {return rootComponents;}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);++ if (WebSession.get().getZoneId() == null) {+ var script = String.format(+ "var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone; %s",+ zoneIdDetectBehavior.getCallbackFunctionBody(explicit("timezone")));+ response.render(OnDomReadyHeaderItem.forScript(script));+ }+ }+@Overrideprotected void onAfterRender() {AppLoader.getInstance(WebSocketManager.class).observe(this);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex baa266a7d9..a1899e38b3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -12,6 +12,7 @@ import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.ajaxlistener.ConfirmClickListener;import io.onedev.server.web.behavior.IssueQueryBehavior;@@ -444,8 +445,8 @@ public class IssueBoardsPage extends ProjectIssuesPage {} else {var iteration = getIterationSelection().getIteration();add(new Label("label", iteration.getName()));- if (iteration.getDueDate() != null- && iteration.getDueDate().before(new Date())+ if (iteration.getDueDay() != null+ && iteration.getDueDay() < DateUtils.toLocalDate(new Date()).toEpochDay()&& !iteration.isClosed()) {add(AttributeAppender.append("class", "btn-danger"));add(AttributeAppender.replace("title", "Iteration is due"));@@ -520,7 +521,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {protected void onConfigure() {super.onConfigure();var iteration = item.getModelObject();- setVisible(iteration.getStartDate() != null && iteration.getDueDate() != null);+ setVisible(iteration.getStartDay() != null && iteration.getDueDay() != null);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.javaindex b3c440be69..5ce08a83f8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/code/TopContributorsResource.java@@ -1,7 +1,24 @@package io.onedev.server.web.page.project.stats.code;+import static io.onedev.server.util.DateUtils.formatISO8601Date;+import static io.onedev.server.util.DateUtils.toDate;+import static java.time.LocalDate.ofEpochDay;++import java.io.IOException;+import java.util.ArrayList;+import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.apache.wicket.request.resource.AbstractResource;+import org.eclipse.jgit.lib.PersonIdent;+import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.collect.Lists;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.git.GitContribution;@@ -14,25 +31,9 @@ import io.onedev.server.search.commit.AuthorCriteria;import io.onedev.server.search.commit.BeforeCriteria;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.xodus.CommitInfoManager;-import org.apache.shiro.authz.UnauthorizedException;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.AbstractResource;-import org.eclipse.jgit.lib.PersonIdent;-import org.joda.time.DateTime;-import org.joda.time.format.DateTimeFormat;-import org.joda.time.format.DateTimeFormatter;--import java.io.IOException;-import java.time.LocalDate;-import java.util.ArrayList;-import java.util.HashMap;-import java.util.List;-import java.util.Map;class TopContributorsResource extends AbstractResource {@@ -67,9 +68,8 @@ class TopContributorsResource extends AbstractResource {if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();- DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");- String fromDate = formatter.print(new DateTime(DateUtils.toDate(LocalDate.ofEpochDay(fromDay).atTime(0, 0, 0, 0))));- String toDate = formatter.print(new DateTime(DateUtils.toDate(LocalDate.ofEpochDay(toDay).plusDays(1).atTime(0, 0, 0, 0))));+ String fromDate = formatISO8601Date(toDate(ofEpochDay(fromDay).atStartOfDay()));+ String toDate = formatISO8601Date(toDate(ofEpochDay(toDay).plusDays(1).atStartOfDay()));List<GitContributor> topContributors = OneDev.getInstance(CommitInfoManager.class).getTopContributors(project.getId(), TOP_CONTRIBUTORS, type, fromDay, toDay);diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 6c713d0fa2..dc1114c49e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -18,6 +18,7 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();+add(new AjaxLink<Void>("test") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.javaindex d9743d39ca..b92002d5c5 100644--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java@@ -1,5 +1,18 @@package io.onedev.server.web.util.editbean;+import static io.onedev.server.util.DateUtils.toDate;+import static java.lang.Integer.parseInt;+import static java.time.LocalDate.ofEpochDay;+import static java.util.stream.Collectors.toList;++import java.io.Serializable;+import java.util.Date;+import java.util.regex.Pattern;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotEmpty;+import io.onedev.server.OneDev;import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;@@ -7,18 +20,8 @@ import io.onedev.server.annotation.Multiline;import io.onedev.server.entitymanager.IterationManager;import io.onedev.server.model.Iteration;import io.onedev.server.model.Project;+import io.onedev.server.util.DateUtils;import io.onedev.server.validation.Validatable;-import org.joda.time.DateTime;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import java.io.Serializable;-import java.util.Date;-import java.util.regex.Pattern;--import static java.lang.Integer.parseInt;-import static java.util.stream.Collectors.toList;@Editable@ClassValidating@@ -97,8 +100,8 @@ public class IterationEditBean implements Validatable, Serializable {public void update(Iteration iteration) {iteration.setName(getName());iteration.setDescription(getDescription());- iteration.setStartDate(getStartDate());- iteration.setDueDate(getDueDate());+ iteration.setStartDay(DateUtils.toLocalDate(getStartDate()).toEpochDay());+ iteration.setDueDay(DateUtils.toLocalDate(getDueDate()).toEpochDay());}public static IterationEditBean ofNew(Project project, @Nullable String namePrefix) {@@ -115,10 +118,10 @@ public class IterationEditBean implements Validatable, Serializable {var matcher = ENDS_WITH_DIGITS.matcher(lastIteration.getName());if (matcher.matches())bean.setName(matcher.group(1) + (parseInt(matcher.group(2)) + 1));- if (lastIteration.getStartDate() != null && lastIteration.getDueDate() != null) {- bean.setStartDate(new DateTime(lastIteration.getDueDate()).plusDays(1).toDate());- var duration = lastIteration.getDueDate().getTime() - lastIteration.getStartDate().getTime();- bean.setDueDate(new DateTime(bean.getStartDate()).plusMillis((int) duration).toDate());+ if (lastIteration.getStartDay() != null && lastIteration.getDueDay() != null) {+ bean.setStartDate(toDate(ofEpochDay(lastIteration.getDueDay() + 1).atStartOfDay()));+ var duration = lastIteration.getDueDay() - lastIteration.getStartDay();+ bean.setDueDate(toDate(ofEpochDay(lastIteration.getDueDay() + duration).atStartOfDay()));}}return bean;@@ -130,8 +133,8 @@ public class IterationEditBean implements Validatable, Serializable {bean.namePrefix = namePrefix;bean.setName(iteration.getName());bean.setDescription(iteration.getDescription());- bean.setStartDate(iteration.getStartDate());- bean.setDueDate(iteration.getDueDate());+ bean.setStartDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay()));+ bean.setDueDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay()));return bean;}diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex 9fc8785a5b..402863f8f4 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -16,6 +16,8 @@*/package io.onedev.server.web.websocket;+import java.io.IOException;+import org.apache.shiro.subject.Subject;import org.apache.shiro.util.ThreadContext;import org.apache.wicket.protocol.http.WebApplication;@@ -32,8 +34,6 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;import io.onedev.server.persistence.SessionManager;-import java.io.IOException;-/*** An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with* Jetty 9.x {@link Session web socket} implementation.diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.javaindex 42f1777c04..73fe2c493e 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java@@ -1,5 +1,7 @@package io.onedev.server.xodus;+import static io.onedev.server.util.DateUtils.toLocalDate;+import java.io.File;import java.io.IOException;import java.io.InputStream;@@ -7,6 +9,7 @@ import java.io.ObjectStreamException;import java.io.Serializable;import java.nio.ByteBuffer;import java.nio.charset.StandardCharsets;+import java.time.ZoneId;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -87,7 +90,6 @@ import io.onedev.server.git.command.RevListOptions;import io.onedev.server.model.Project;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.ElementPumper;import io.onedev.server.util.NameAndEmail;import io.onedev.server.util.Pair;@@ -537,7 +539,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager@Overridepublic void process(LogCommit currentCommit) {if (currentCommit.getCommitDate() != null && currentCommit.getParentHashes().size() <= 1) {- int day = (int) DateUtils.toLocalDate(currentCommit.getCommitDate()).toEpochDay();+ int day = (int) toLocalDate(currentCommit.getCommitDate(), ZoneId.systemDefault()).toEpochDay();updateContribution(overallContributions, day, currentCommit, filePatterns);if (currentCommit.getAuthor() != null) {@@ -784,7 +786,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManagerprivate void updateLineStats(Transaction txn, LogCommit currentCommit, Map<Integer, Map<String, Integer>> lineStats,PatternSet filePatterns) {- int day = (int) DateUtils.toLocalDate(currentCommit.getCommitDate()).toEpochDay();+ int day = (int) toLocalDate(currentCommit.getCommitDate(), ZoneId.systemDefault()).toEpochDay();Map<String, Integer> lineStatsOnDay = lineStats.get(day);if (lineStatsOnDay == null) {diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.javaindex 92ffe46e43..1cc18f7963 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultIssueInfoManager.java@@ -1,6 +1,25 @@package io.onedev.server.xodus;+import static io.onedev.server.util.DateUtils.toLocalDate;+import static java.lang.Long.valueOf;++import java.io.File;+import java.io.ObjectStreamException;+import java.io.Serializable;+import java.time.ZoneId;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.commons.lang.SerializationUtils;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.FileUtils;import io.onedev.server.cluster.ClusterTask;@@ -10,7 +29,13 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.Listen;import io.onedev.server.event.project.ActiveServerChanged;import io.onedev.server.event.project.ProjectDeleted;-import io.onedev.server.event.project.issue.*;+import io.onedev.server.event.project.issue.IssueChanged;+import io.onedev.server.event.project.issue.IssueDeleted;+import io.onedev.server.event.project.issue.IssueOpened;+import io.onedev.server.event.project.issue.IssuesCopied;+import io.onedev.server.event.project.issue.IssuesDeleted;+import io.onedev.server.event.project.issue.IssuesImported;+import io.onedev.server.event.project.issue.IssuesMoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;@@ -26,21 +51,6 @@ import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;import jetbrains.exodus.env.Store;import jetbrains.exodus.env.Transaction;-import org.apache.commons.lang.SerializationUtils;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import javax.inject.Inject;-import javax.inject.Singleton;-import java.io.File;-import java.io.ObjectStreamException;-import java.io.Serializable;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import static io.onedev.server.util.DateUtils.toLocalDate;-import static java.lang.Long.valueOf;@Singletonpublic class DefaultIssueInfoManager extends AbstractEnvironmentManager@@ -147,7 +157,7 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManagerbyte[] bytes = Preconditions.checkNotNull(readBytes(stateHistoryStore, txn, issueKey));@SuppressWarnings("unchecked")Map<Long, String> stateHistory = (Map<Long, String>) SerializationUtils.deserialize(bytes);- stateHistory.put(toLocalDate(change.getDate()).toEpochDay(), state);+ stateHistory.put(toLocalDate(change.getDate(), ZoneId.systemDefault()).toEpochDay(), state);stateHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) stateHistory)));}@@ -158,7 +168,7 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManagerbyte[] bytes = Preconditions.checkNotNull(readBytes(spentTimeHistoryStore, txn, issueKey));@SuppressWarnings("unchecked")Map<Long, Integer> spentTimeHistory = (Map<Long, Integer>) SerializationUtils.deserialize(bytes);- spentTimeHistory.put(toLocalDate(change.getDate()).toEpochDay(), spentTime);+ spentTimeHistory.put(toLocalDate(change.getDate(), ZoneId.systemDefault()).toEpochDay(), spentTime);spentTimeHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) spentTimeHistory)));}@@ -178,7 +188,7 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManagerbyte[] bytes = readBytes(stateHistoryStore, txn, issueKey);if (bytes == null) {Map<Long, String> stateHistory = new LinkedHashMap<>();- stateHistory.put(toLocalDate(issue.getSubmitDate()).toEpochDay(), issue.getState());+ stateHistory.put(toLocalDate(issue.getSubmitDate(), ZoneId.systemDefault()).toEpochDay(), issue.getState());stateHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) stateHistory)));}}@@ -188,7 +198,7 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManagerbyte[] bytes = readBytes(spentTimeHistoryStore, txn, issueKey);if (bytes == null) {Map<Long, Integer> spentTimeHistory = new LinkedHashMap<>();- spentTimeHistory.put(toLocalDate(issue.getSubmitDate()).toEpochDay(), issue.getOwnSpentTime());+ spentTimeHistory.put(toLocalDate(issue.getSubmitDate(), ZoneId.systemDefault()).toEpochDay(), issue.getOwnSpentTime());spentTimeHistoryStore.put(txn, issueKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) spentTimeHistory)));}}diff --git a/server-ee b/server-eeindex 4192d3695c..11b35411ec 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 4192d3695cd58a716a2584cb087e44834e8c83b0+Subproject commit 11b35411ecf6c0a7fe09b6fb37f4e9a6991e3bb0diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 64aa24df24..a0eb2f5d89 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -1,6 +1,44 @@package io.onedev.server.plugin.imports.gitea;+import java.io.Serializable;+import java.net.URI;+import java.net.URISyntaxException;+import java.time.Instant;+import java.time.ZoneId;+import java.time.format.DateTimeFormatter;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.concurrent.atomic.AtomicInteger;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotEmpty;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.Response;++import org.apache.http.client.utils.URIBuilder;+import org.apache.shiro.authz.UnauthorizedException;+import org.glassfish.jersey.client.ClientProperties;+import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;+import org.joda.time.format.ISODateTimeFormat;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import com.fasterxml.jackson.databind.JsonNode;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.bootstrap.SensitiveMasker;import io.onedev.commons.utils.ExplicitException;@@ -11,12 +49,22 @@ import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IterationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.issue.IssuesImported;import io.onedev.server.git.command.LsRemoteCommand;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -30,30 +78,6 @@ import io.onedev.server.util.Pair;import io.onedev.server.validation.Validatable;import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.taskbutton.TaskResult.HtmlMessgae;-import org.apache.http.client.utils.URIBuilder;-import org.apache.shiro.authz.UnauthorizedException;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.oauth2.OAuth2ClientSupport;-import org.joda.time.format.ISODateTimeFormat;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;-import java.io.Serializable;-import java.net.URI;-import java.net.URISyntaxException;-import java.time.Instant;-import java.time.format.DateTimeFormatter;-import java.util.*;-import java.util.concurrent.atomic.AtomicInteger;@Editable@ClassValidating@@ -544,7 +568,7 @@ public class ImportServer implements Serializable, Validatable {iteration.setProject(project);String dueDateString = milestoneNode.get("due_on").asText(null);if (dueDateString != null)- iteration.setDueDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate());+ iteration.setDueDay(DateUtils.toLocalDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate(), ZoneId.systemDefault()).toEpochDay());if (milestoneNode.get("state").asText().equals("closed"))iteration.setClosed(true);diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex c18a14e568..65b9706b20 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -1,6 +1,41 @@package io.onedev.server.plugin.imports.github;+import java.io.Serializable;+import java.net.URI;+import java.net.URISyntaxException;+import java.time.ZoneId;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.concurrent.atomic.AtomicInteger;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotEmpty;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.Response;++import org.apache.http.client.utils.URIBuilder;+import org.apache.shiro.authz.UnauthorizedException;+import org.glassfish.jersey.client.ClientProperties;+import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;+import org.joda.time.format.ISODateTimeFormat;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import com.fasterxml.jackson.databind.JsonNode;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.bootstrap.SensitiveMasker;import io.onedev.commons.utils.ExplicitException;@@ -11,46 +46,35 @@ import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IterationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.issue.IssuesImported;import io.onedev.server.git.command.LsRemoteCommand;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;import io.onedev.server.validation.Validatable;import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.taskbutton.TaskResult.HtmlMessgae;-import org.apache.http.client.utils.URIBuilder;-import org.apache.shiro.authz.UnauthorizedException;-import org.glassfish.jersey.client.ClientProperties;-import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;-import org.joda.time.format.ISODateTimeFormat;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;-import java.io.Serializable;-import java.net.URI;-import java.net.URISyntaxException;-import java.util.*;-import java.util.concurrent.atomic.AtomicInteger;@Editable@ClassValidating@@ -592,7 +616,7 @@ public class ImportServer implements Serializable, Validatable {iteration.setProject(project);String dueDateString = milestoneNode.get("due_on").asText(null);if (dueDateString != null)- iteration.setDueDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate());+ iteration.setDueDay(DateUtils.toLocalDate(ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dueDateString).toDate(), ZoneId.systemDefault()).toEpochDay());if (milestoneNode.get("state").asText().equals("closed"))iteration.setClosed(true);diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex 09c318f39d..bb590bb735 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -1,6 +1,44 @@package io.onedev.server.plugin.imports.gitlab;+import java.io.IOException;+import java.io.InputStream;+import java.io.Serializable;+import java.net.URI;+import java.net.URISyntaxException;+import java.time.ZoneId;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Map;+import java.util.Optional;+import java.util.Set;+import java.util.concurrent.atomic.AtomicInteger;+import java.util.regex.Matcher;+import java.util.regex.Pattern;++import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;+import javax.validation.constraints.NotEmpty;+import javax.ws.rs.client.Client;+import javax.ws.rs.client.ClientBuilder;+import javax.ws.rs.client.Invocation;+import javax.ws.rs.client.WebTarget;+import javax.ws.rs.core.Response;++import org.apache.http.client.utils.URIBuilder;+import org.apache.shiro.authz.UnauthorizedException;+import org.glassfish.jersey.client.ClientProperties;+import org.joda.time.format.ISODateTimeFormat;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import org.unbescape.html.HtmlEscape;+import com.fasterxml.jackson.databind.JsonNode;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.bootstrap.SensitiveMasker;import io.onedev.commons.utils.ExplicitException;@@ -13,12 +51,22 @@ import io.onedev.server.annotation.Password;import io.onedev.server.attachment.AttachmentManager;import io.onedev.server.attachment.AttachmentTooLargeException;import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.entitymanager.*;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IterationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.issue.IssuesImported;import io.onedev.server.git.command.LsRemoteCommand;-import io.onedev.server.model.*;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueField;+import io.onedev.server.model.IssueSchedule;+import io.onedev.server.model.Iteration;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.field.spec.FieldSpec;@@ -26,37 +74,13 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.CollectionUtils;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;import io.onedev.server.validation.Validatable;import io.onedev.server.web.component.taskbutton.TaskResult;import io.onedev.server.web.component.taskbutton.TaskResult.HtmlMessgae;-import org.apache.http.client.utils.URIBuilder;-import org.apache.shiro.authz.UnauthorizedException;-import org.glassfish.jersey.client.ClientProperties;-import org.joda.time.format.ISODateTimeFormat;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import org.unbescape.html.HtmlEscape;--import javax.annotation.Nullable;-import javax.validation.ConstraintValidatorContext;-import javax.validation.constraints.NotEmpty;-import javax.ws.rs.client.Client;-import javax.ws.rs.client.ClientBuilder;-import javax.ws.rs.client.Invocation;-import javax.ws.rs.client.WebTarget;-import javax.ws.rs.core.Response;-import java.io.IOException;-import java.io.InputStream;-import java.io.Serializable;-import java.net.URI;-import java.net.URISyntaxException;-import java.util.*;-import java.util.concurrent.atomic.AtomicInteger;-import java.util.regex.Matcher;-import java.util.regex.Pattern;@Editable@ClassValidating@@ -249,7 +273,7 @@ public class ImportServer implements Serializable, Validatable {iteration.setDescription(milestoneNode.get("description").asText(null));String dueDateString = milestoneNode.get("due_date").asText(null);if (dueDateString != null)- iteration.setDueDate(ISODateTimeFormat.date().parseDateTime(dueDateString).toDate());+ iteration.setDueDay(DateUtils.toLocalDate(ISODateTimeFormat.date().parseDateTime(dueDateString).toDate(), ZoneId.systemDefault()).toEpochDay());if (milestoneNode.get("state").asText().equals("closed"))iteration.setClosed(true);return iteration;