diff --git a/src/main/java/cc/ryanc/halo/listener/StartedListener.java b/src/main/java/cc/ryanc/halo/listener/StartedListener.java index 2a4e1cfca..211534480 100644 --- a/src/main/java/cc/ryanc/halo/listener/StartedListener.java +++ b/src/main/java/cc/ryanc/halo/listener/StartedListener.java @@ -1,11 +1,14 @@ package cc.ryanc.halo.listener; import cc.ryanc.halo.config.properties.HaloProperties; +import cc.ryanc.halo.model.entity.User; import cc.ryanc.halo.model.enums.BlogProperties; +import cc.ryanc.halo.model.params.UserParam; import cc.ryanc.halo.model.support.HaloConst; import cc.ryanc.halo.model.support.Theme; import cc.ryanc.halo.service.OptionService; import cc.ryanc.halo.service.ThemeService; +import cc.ryanc.halo.service.UserService; import cc.ryanc.halo.utils.HaloUtils; import cc.ryanc.halo.web.controller.content.base.BaseContentController; import cn.hutool.core.io.FileUtil; @@ -58,6 +61,9 @@ public class StartedListener implements ApplicationListener users = userService.listAll(); + + if (users.isEmpty()) { + UserParam userParam = new UserParam(); + userParam.setUsername("test"); + userParam.setNickname("developer"); + userParam.setEmail("test@test.com"); + + log.debug("Initializing a test user: [{}]", userParam); + + User testUser = userService.createBy(userParam, "opentest"); + + log.debug("Initialized a test user: [{}]", testUser); + } } /** diff --git a/src/main/java/cc/ryanc/halo/model/entity/User.java b/src/main/java/cc/ryanc/halo/model/entity/User.java index d5ccd1330..e7dc75004 100644 --- a/src/main/java/cc/ryanc/halo/model/entity/User.java +++ b/src/main/java/cc/ryanc/halo/model/entity/User.java @@ -1,5 +1,6 @@ package cc.ryanc.halo.model.entity; +import cc.ryanc.halo.utils.DateUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -20,7 +21,7 @@ import java.util.Date; @Table(name = "users") @SQLDelete(sql = "update users set deleted = true where id = ?") @Where(clause = "deleted = false") -@ToString +@ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) public class User extends BaseEntity { @@ -76,6 +77,23 @@ public class User extends BaseEntity { @Override public void prePersist() { super.prePersist(); + id = null; + + if (email == null) { + email = ""; + } + + if (avatar == null) { + avatar = ""; + } + + if (description == null) { + description = ""; + } + + if (expireTime == null) { + expireTime = DateUtils.now(); + } } } diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 6664d6a75..3701d9ca0 100755 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -53,3 +53,4 @@ logging: halo: doc-disabled: false + production-env: false