github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Format error tip for banning

pull/137/head
johnniang 2019-03-29 15:08:38 +08:00
parent fdc294b335
commit fd59393634
3 changed files with 92 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java
View File

@ -95,12 +95,11 @@ public class UserServiceImpl extends AbstractCrudService<User, Integer> implemen
// Check expiration
if (user.getExpireTime() != null && user.getExpireTime().after(now)) {
long seconds = TimeUnit.MINUTES.toSeconds(user.getExpireTime().getTime() - now.getTime());
long seconds = TimeUnit.MILLISECONDS.toSeconds(user.getExpireTime().getTime() - now.getTime());
// If expired
throw new BadRequestException("You have been temporarily disabled，please try again " + seconds + " second(s) later").setErrorData(seconds);
throw new BadRequestException("You have been temporarily disabled，please try again " + HaloUtils.timeFormat(seconds) + " later").setErrorData(seconds);
}
if (!BCrypt.checkpw(password, user.getPassword())) {
// If the password is mismatch
// Add login failure count

70
src/main/java/cc/ryanc/halo/utils/HaloUtils.java
View File

@ -16,12 +16,8 @@ import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Calendar;
import java.util.Date;
import java.util.Properties;
import java.util.UUID;
@ -37,28 +33,65 @@ import java.util.UUID;
@Slf4j
public class HaloUtils {
@NonNull
public static String timeFormat(long totalSeconds) {
if (totalSeconds <= 0) {
return "0 second";
}
StringBuilder timeBuilder = new StringBuilder();
long hours = totalSeconds / 3600;
long minutes = totalSeconds % 3600 / 60;
long seconds = totalSeconds % 3600 % 60;
if (hours > 0) {
if (StringUtils.isNotBlank(timeBuilder)) {
timeBuilder.append(", ");
}
timeBuilder.append(pluralize(hours, "hour", "hours"));
}
if (minutes > 0) {
if (StringUtils.isNotBlank(timeBuilder)) {
timeBuilder.append(", ");
}
timeBuilder.append(pluralize(minutes, "minute", "minutes"));
}
if (seconds > 0) {
if (StringUtils.isNotBlank(timeBuilder)) {
timeBuilder.append(", ");
}
timeBuilder.append(pluralize(seconds, "second", "seconds"));
}
return timeBuilder.toString();
}
/**
* Pluralize the time label format.
* Pluralize the times label format.
*
* @param time time
* @param times times
* @param label label
* @param pluralLabel plural label
* @return pluralized format
*/
@NonNull
public static String pluralize(long time, @NonNull String label, @NonNull String pluralLabel) {
public static String pluralize(long times, @NonNull String label, @NonNull String pluralLabel) {
Assert.hasText(label, "Label must not be blank");
Assert.hasText(pluralLabel, "Plural label must not be blank");
if (time <= 0) {
if (times <= 0) {
return "no " + label;
}
if (time == 1) {
return time + " " + label;
if (times == 1) {
return times + " " + label;
}
return time + " " + pluralLabel;
return times + " " + pluralLabel;
}
/**
@ -184,18 +217,13 @@ public class HaloUtils {
* @return 时间
*/
public static Date getCreateTime(String srcPath) {
final Path path = Paths.get(srcPath);
final BasicFileAttributeView basicview = Files.getFileAttributeView(path, BasicFileAttributeView.class, LinkOption.NOFOLLOW_LINKS);
BasicFileAttributes attr;
try {
attr = basicview.readAttributes();
return new Date(attr.creationTime().toMillis());
} catch (Exception e) {
e.printStackTrace();
BasicFileAttributes basicFileAttributes = Files.readAttributes(Paths.get(srcPath), BasicFileAttributes.class);
basicFileAttributes.creationTime().toMillis();
return new Date(basicFileAttributes.creationTime().toMillis());
} catch (IOException e) {
throw new RuntimeException("Failed to open the " + srcPath + " file", e);
}
final Calendar cal = Calendar.getInstance();
cal.set(1970, 0, 1, 0, 0, 0);
return cal.getTime();
}
/**

41
src/test/java/cc/ryanc/halo/utils/HaloUtilsTest.java
View File

@ -16,6 +16,47 @@ import static org.junit.Assert.assertThat;
*/
public class HaloUtilsTest {
@Test
public void timeFormatTest() {
long seconds = 0;
String timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("0 second"));
seconds = -1;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("0 second"));
seconds = 30;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("30 seconds"));
seconds = 60;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("1 minute"));
seconds = 120;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("2 minutes"));
seconds = 3600;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("1 hour"));
seconds = 7200;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("2 hours"));
seconds = 7200 + 30;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("2 hours, 30 seconds"));
seconds = 7200 + 60 + 30;
timeFormat = HaloUtils.timeFormat(seconds);
assertThat(timeFormat, equalTo("2 hours, 1 minute, 30 seconds"));
}
@Test
public void pluralizeTest() {