静态工厂方法添加 @StaticFactoryMethod 注解。

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java

@@ -1,5 +1,9 @@
 package xyz.zhouxy.plusone.constant;
 
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 
 /**
@@ -9,24 +13,24 @@ import xyz.zhouxy.plusone.commons.util.Enumeration;
  */
 public final class EntityStatus extends Enumeration<EntityStatus> {
 
-    private EntityStatus(int value, String name) {
-        super(value, name);
+    private EntityStatus(int id, @Nonnull String name) {
+        super(id, name);
     }
 
     // 常量
     public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常");
     public static final EntityStatus DISABLED = new EntityStatus(1, "禁用");
 
-    private static final EnumerationValuesHolder<EntityStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
-            AVAILABLE,
-            DISABLED);
+    private static final ValueSet<EntityStatus> VALUE_SET = new ValueSet<>(
+            AVAILABLE, DISABLED);
 
-    public static EntityStatus of(int value) {
-        return ENUMERATION_VALUES.get(value);
+    @Nonnull
+    public static EntityStatus of(int id) {
+        return VALUE_SET.get(id);
     }
 
-    @Override
-    public String toString() {
-        return "EntityStatus" + super.toString();
+    @Nonnull
+    public static Collection<EntityStatus> constants() {
+        return VALUE_SET.getValues();
     }
 }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/oss/FastDFSUtil.java

@@ -1,8 +1,17 @@
 package xyz.zhouxy.plusone.oss;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.csource.common.MyException;
 import org.csource.common.NameValuePair;
@@ -14,7 +23,10 @@ import org.csource.fastdfs.TrackerServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.io.Files;
+
 import lombok.Getter;
+import xyz.zhouxy.plusone.exception.SysException;
 
 public class FastDFSUtil {
 
@@ -44,7 +56,7 @@ public class FastDFSUtil {
      * @throws FastDFSException
      */
     public String[] upload(FastDFSFile file) throws FastDFSException {
-        logger.info("File Name: {}, File Length: {}", file.getName(), file.getContent().length);
+        logger.info("File Name: {}, File Length: {}", file.getFileName(), file.getContent().length);
 
         NameValuePair[] metaList = new NameValuePair[1];
         metaList[0] = new NameValuePair("author", file.getAuthor());
@@ -63,7 +75,7 @@ public class FastDFSUtil {
                     uploadResults[0], uploadResults[1], System.currentTimeMillis() - startTime);
 
         } catch (IOException e) {
-            throw new FastDFSException("IO Exception when uploadind the file:" + file.getName(), e);
+            throw new FastDFSException("IO Exception when uploadind the file:" + file.getFileName(), e);
         } catch (MyException e) {
             throw new FastDFSException(e);
         }
@@ -109,18 +121,68 @@ public class FastDFSUtil {
         }
     }
 
-    @Getter
     public static final class FastDFSFile {
-        private String name;
-        private byte[] content;
-        private String ext;
-        private String md5;
-        private String author;
+        @Getter
+        private final String fileName;
+        private final byte[] content;
+        @Getter
+        private final String ext;
+        @Getter
+        private final String md5;
+        @Getter
+        private final String author;
 
-        public FastDFSFile(String name, byte[] content, String ext) {
-            this.name = name;
+        private FastDFSFile(@Nonnull File file, @Nullable String author) throws IOException {
+            this.fileName = file.getName();
+            this.content = Files.toByteArray(file);
+            this.ext = Files.getFileExtension(fileName);
+            this.md5 = md5Hex(content);
+            this.author = author;
+        }
+
+        private FastDFSFile(@Nonnull String fileName, @Nonnull byte[] content, @Nullable String author) {
+            this.fileName = fileName;
             this.content = content;
-            this.ext = ext;
+            this.ext = Files.getFileExtension(fileName);
+            this.md5 = md5Hex(content);
+            this.author = author;
+        }
+
+        @Nonnull
+        public static FastDFSFile of(@Nonnull File file) throws IOException {
+            return new FastDFSFile(file, null);
+        }
+
+        @Nonnull
+        public static FastDFSFile of(@Nonnull File file, @Nullable String author) throws IOException {
+            return new FastDFSFile(file, author);
+        }
+
+        @Nonnull
+        public static FastDFSFile of(@Nonnull String fileName, @Nonnull byte[] content) {
+            return new FastDFSFile(fileName, content, null);
+        }
+
+        @Nonnull
+        public static FastDFSFile of(@Nonnull String fileName, @Nonnull byte[] content, @Nullable String author) {
+            return new FastDFSFile(fileName, content, author);
+        }
+
+        public byte[] getContent() {
+            return Arrays.copyOf(content, content.length);
+        }
+
+        @Nonnull
+        private static String md5Hex(byte[] data) {
+            try {
+                MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+                messageDigest.update(data);
+                byte[] result = messageDigest.digest();
+                var sha512Hex = new BigInteger(1, result).toString(16);
+                return Objects.requireNonNull(sha512Hex);
+            } catch (NoSuchAlgorithmException e) {
+                throw new SysException(e);
+            }
         }
     }
 }

plusone-start/src/test/java/xyz/zhouxy/plusone/FastDFSTests.java

@@ -1,12 +1,11 @@
 package xyz.zhouxy.plusone;
 
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import javax.annotation.Resource;
 
-import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -24,10 +23,7 @@ class FastDFSTests {
 
     @Test
     void testOSS() throws FileNotFoundException, IOException, FastDFSException {
-        try (FileInputStream in = new FileInputStream("D:\\ZhouXY\\Desktop\\666.png");) {
-            byte[] content = IOUtils.toByteArray(in);
-            String[] upload = fastDFSUtil.upload(new FastDFSFile("666.png", content, "png"));
-            log.info(String.join("/", upload));
-        }
+        String[] upload = fastDFSUtil.upload(FastDFSFile.of(new File("D:\\ZhouXY\\Desktop\\666.png")));
+        log.info(String.join("/", upload));
     }
 }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/result/MenuViewObject.java

@@ -109,7 +109,7 @@ public class MenuViewObject implements IWithOrderNumber {
         viewObject.icon = menu.getIcon();
         viewObject.hidden = menu.isHidden();
         viewObject.orderNumber = menu.getOrderNumber();
-        viewObject.status = menu.getStatus().getValue();
+        viewObject.status = menu.getStatus().getId();
         viewObject.remarks = menu.getRemarks();
         if (viewObject.type == MenuType.MENU_ITEM.ordinal()) {
             viewObject.component = menu.getComponent();

plusone-system/plusone-system-common/src/main/java/xyz/zhouxy/plusone/system/util/PasswordUtil.java

@@ -4,10 +4,10 @@ import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
-import lombok.extern.slf4j.Slf4j;
 import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
 import xyz.zhouxy.plusone.exception.BizException;
 import xyz.zhouxy.plusone.util.RandomUtil;
@@ -17,7 +17,6 @@ import xyz.zhouxy.plusone.util.RandomUtil;
  *
  * @author <a href="https://gitee.com/zhouxy108">ZhouXY</a>
  */
-@Slf4j
 public final class PasswordUtil {
     private static final char[] SALT_BASE_CHAR_ARRAY = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()_-+={}[]|\\:;\"',.<>?/"
             .toCharArray();
@@ -36,11 +35,12 @@ public final class PasswordUtil {
         var passwordWithSalt = salt.substring(0, i)
                 + password
                 + salt.substring(1);
-        String sha512Hex = sha512Hex(passwordWithSalt);
-        if (sha512Hex == null) {
-            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "未知错误：哈希加密失败！");
+
+        try {
+            return sha512Hex(passwordWithSalt);
+        } catch (Exception e) {
+            throw new BizException(ErrorCodeConsts.DEFAULT_ERROR_CODE, "哈希加密失败！", e);
         }
-        return sha512Hex;
     }
 
     /**
@@ -57,15 +57,12 @@ public final class PasswordUtil {
         throw new IllegalStateException("Utility class");
     }
 
-    private static String sha512Hex(String data) {
-        try {
-            MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
-            messageDigest.update(data.getBytes(StandardCharsets.UTF_8));
-            byte[] result = messageDigest.digest();
-            return new BigInteger(1, result).toString(16);
-        } catch (NoSuchAlgorithmException e) {
-            log.error("{}", e);
-        }
-        return null;
+    @Nonnull
+    private static String sha512Hex(String data) throws NoSuchAlgorithmException {
+        MessageDigest messageDigest = MessageDigest.getInstance("SHA-512");
+        messageDigest.update(data.getBytes(StandardCharsets.UTF_8));
+        byte[] result = messageDigest.digest();
+        var sha512Hex = new BigInteger(1, result).toString(16);
+        return Objects.requireNonNull(sha512Hex);
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Account.java

@@ -6,6 +6,7 @@ import java.util.Optional;
 import java.util.Set;
 
 import lombok.ToString;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.domain.AggregateRoot;
 import xyz.zhouxy.plusone.domain.IWithVersion;
 import xyz.zhouxy.plusone.exception.UserOperationException;
@@ -164,6 +165,7 @@ public class Account extends AggregateRoot<Long> implements IWithVersion {
         return newInstance;
     }
 
+    @StaticFactoryMethod(Account.class)
     public static Account register(
             Username username,
             Email email,
@@ -193,6 +195,7 @@ public class Account extends AggregateRoot<Long> implements IWithVersion {
                 password, status, accountInfo, roleRefs, createdBy, updatedBy, version);
     }
 
+    @StaticFactoryMethod(Account.class)
     public static Account newInstance(
             String username,
             String email,
@@ -210,6 +213,7 @@ public class Account extends AggregateRoot<Long> implements IWithVersion {
         return newInstance;
     }
 
+    @StaticFactoryMethod(Account.class)
     public static Account register(
             String username,
             String email,

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java

@@ -1,5 +1,9 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
 import lombok.Getter;
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 import xyz.zhouxy.plusone.domain.IValueObject;
@@ -12,18 +16,23 @@ import xyz.zhouxy.plusone.domain.IValueObject;
 @Getter
 public final class AccountStatus extends Enumeration<AccountStatus> implements IValueObject {
 
-    private AccountStatus(int value, String name) {
-        super(value, name);
+    private AccountStatus(int id, @Nonnull String name) {
+        super(id, name);
     }
 
     public static final AccountStatus AVAILABLE = new AccountStatus(0, "账号正常");
     public static final AccountStatus LOCKED = new AccountStatus(1, "账号被锁定");
 
-    private static final EnumerationValuesHolder<AccountStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+    private static final ValueSet<AccountStatus> VALUE_SET = new ValueSet<>(
             AVAILABLE,
             LOCKED);
 
-    public static AccountStatus of(int value) {
-        return ENUMERATION_VALUES.get(value);
+    public static AccountStatus of(int id) {
+        return VALUE_SET.get(id);
+    }
+
+    @Nonnull
+    public static Collection<AccountStatus> constants() {
+        return VALUE_SET.getValues();
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Email.java

@@ -4,6 +4,7 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 
 import cn.hutool.core.util.DesensitizedUtil;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 
 /**
@@ -26,10 +27,12 @@ public class Email extends Principal {
         }
     }
 
+    @StaticFactoryMethod(Email.class)
     public static Email of(String email) {
         return new Email(email);
     }
 
+    @StaticFactoryMethod(Email.class)
     public static Email ofNullable(String email) {
         return Objects.nonNull(email) ? new Email(email) : null;
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/MobilePhone.java

@@ -4,6 +4,7 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 
 import cn.hutool.core.util.DesensitizedUtil;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 
 /**
@@ -26,10 +27,12 @@ public class MobilePhone extends Principal {
         }
     }
 
+    @StaticFactoryMethod(MobilePhone.class)
     public static MobilePhone of(String mobilePhone) {
         return new MobilePhone(mobilePhone);
     }
 
+    @StaticFactoryMethod(MobilePhone.class)
     public static MobilePhone ofNullable(String mobilePhone) {
         return Objects.nonNull(mobilePhone) ? new MobilePhone(mobilePhone) : null;
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Nickname.java

@@ -3,6 +3,7 @@ package xyz.zhouxy.plusone.system.domain.model.account;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.domain.ValidatableStringRecord;
 
@@ -26,10 +27,12 @@ public class Nickname extends ValidatableStringRecord {
         }
     }
 
+    @StaticFactoryMethod(Nickname.class)
     public static Nickname of(String nickname) {
         return new Nickname(nickname);
     }
 
+    @StaticFactoryMethod(Nickname.class)
     public static Nickname ofNullable(String nickname) {
         return Objects.nonNull(nickname) ? new Nickname(nickname) : null;
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Password.java

@@ -7,6 +7,7 @@ import javax.annotation.Nonnull;
 
 import org.springframework.util.Assert;
 
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
 import xyz.zhouxy.plusone.domain.IValueObject;
@@ -51,15 +52,18 @@ public class Password implements IValueObject {
         this.saltVal = salt;
     }
 
+    @StaticFactoryMethod(Password.class)
     public static Password of(String password, String salt) {
         return new Password(password, salt);
     }
 
+    @StaticFactoryMethod(Password.class)
     public static Password newPassword(String newPassword, String passwordConfirmation) {
         Assert.isTrue(Objects.equals(newPassword, passwordConfirmation), "两次输入的密码不一致");
         return newPassword(newPassword);
     }
 
+    @StaticFactoryMethod(Password.class)
     public static Password newPassword(String newPassword) {
         return new Password(newPassword);
     }
@@ -80,6 +84,7 @@ public class Password implements IValueObject {
         return saltVal;
     }
 
+    @StaticFactoryMethod(Nickname.class)
     public static Password newDefaultPassword() {
         return newPassword(DEFAULT_PASSWORD);
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java

@@ -1,7 +1,10 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
+import java.util.Collection;
+
 import javax.annotation.Nonnull;
 
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 import xyz.zhouxy.plusone.domain.IValueObject;
 
@@ -18,16 +21,20 @@ public final class Sex extends Enumeration<Sex> implements IValueObject {
     @Nonnull
     public static final Sex FEMALE = new Sex(2, "女性");
 
-    private Sex(int value, String name) {
-        super(value, name);
+    private Sex(int id, @Nonnull String name) {
+        super(id, name);
     }
 
-    private static EnumerationValuesHolder<Sex> values = new EnumerationValuesHolder<>(
-            UNSET,
-            MALE,
-            FEMALE);
+    private static final ValueSet<Sex> VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE);
 
+    @Nonnull
+    @StaticFactoryMethod(Sex.class)
     public static Sex of(int value) {
-        return values.get(value);
+        return VALUE_SET.get(value);
+    }
+
+    @Nonnull
+    public static Collection<Sex> constants() {
+        return VALUE_SET.getValues();
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Username.java

@@ -2,6 +2,7 @@ package xyz.zhouxy.plusone.system.domain.model.account;
 
 import java.util.regex.Pattern;
 
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.commons.constant.PatternConsts;
 
 /**
@@ -24,6 +25,7 @@ public class Username extends Principal {
         }
     }
 
+    @StaticFactoryMethod(Username.class)
     public static Username of(String username) {
         return new Username(username);
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/dict/Dict.java

@@ -8,6 +8,7 @@ import java.util.Optional;
 import java.util.Set;
 
 import lombok.ToString;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.domain.AggregateRoot;
 import xyz.zhouxy.plusone.domain.IWithLabel;
 import xyz.zhouxy.plusone.domain.IWithVersion;
@@ -70,12 +71,14 @@ public class Dict extends AggregateRoot<Long> implements IWithLabel, IWithVersio
         this.version = version;
     }
 
+    @StaticFactoryMethod(Dict.class)
     public static Dict newInstance(
             String dictType,
             String dictLabel) {
         return new Dict(null, dictType, dictLabel, Collections.emptySet(), 0);
     }
 
+    @StaticFactoryMethod(Dict.class)
     public static Dict newInstance(
             String dictType,
             String dictLabel,
@@ -83,6 +86,7 @@ public class Dict extends AggregateRoot<Long> implements IWithLabel, IWithVersio
         return new Dict(null, dictType, dictLabel, values, 0);
     }
 
+    @StaticFactoryMethod(Dict.class)
     public static Dict newInstance(
             String dictType,
             String dictLabel,

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/dict/DictValue.java

@@ -4,6 +4,7 @@ import java.util.Objects;
 
 import lombok.Getter;
 import lombok.ToString;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.domain.IValueObject;
 
 /**
@@ -25,6 +26,7 @@ public class DictValue implements IValueObject {
         this.label = label;
     }
 
+    @StaticFactoryMethod(DictValue.class)
     public static DictValue of(int key, String label) {
         return new DictValue(key, label);
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/menu/MenuConstructor.java

@@ -2,6 +2,7 @@ package xyz.zhouxy.plusone.system.domain.model.menu;
 
 import java.util.List;
 
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.constant.EntityStatus;
 import xyz.zhouxy.plusone.system.domain.model.menu.Menu.MenuType;
 
@@ -16,6 +17,7 @@ public class MenuConstructor {
         throw new IllegalStateException("Utility class");
     }
 
+    @StaticFactoryMethod(Menu.class)
     public static Menu newMenuItem(
             long parentId,
             String path,
@@ -39,6 +41,7 @@ public class MenuConstructor {
                 remarks, component, cache, resource, actions, 0L);
     }
 
+    @StaticFactoryMethod(Menu.class)
     public static Menu newMenuList(
             long parentId,
             String path,

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/permission/Action.java

@@ -3,6 +3,7 @@ package xyz.zhouxy.plusone.system.domain.model.permission;
 import java.util.Optional;
 
 import lombok.Getter;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.domain.Entity;
 import xyz.zhouxy.plusone.domain.IWithLabel;
 import xyz.zhouxy.plusone.domain.IWithVersion;
@@ -20,7 +21,7 @@ public class Action extends Entity<Long> implements IWithLabel, IWithVersion {
     @Getter String label;
     @Getter long version;
 
-    public Action(Long id, String resource, String identifier, String label, long version) {
+    private Action(Long id, String resource, String identifier, String label, long version) {
         this.id = id;
         this.resource = resource;
         this.identifier = identifier;
@@ -28,10 +29,12 @@ public class Action extends Entity<Long> implements IWithLabel, IWithVersion {
         this.version = version;
     }
 
+    @StaticFactoryMethod(Action.class)
     static Action newInstance(String resource, String identifier, String label) {
         return new Action(null, resource, identifier, label, 0L);
     }
 
+    @StaticFactoryMethod(Action.class)
     static Action existingInstance(Long id, String resource, String action, String label, Long version) {
         return new Action(id, resource, action, label, version);
     }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/permission/Permission.java

@@ -6,6 +6,7 @@ import java.util.Objects;
 import java.util.Optional;
 
 import lombok.Getter;
+import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
 import xyz.zhouxy.plusone.domain.AggregateRoot;
 import xyz.zhouxy.plusone.domain.IWithVersion;
 
@@ -37,6 +38,7 @@ public class Permission extends AggregateRoot<Long> implements IWithVersion {
 
     // ==================== 实例化 ====================
 
+    @StaticFactoryMethod(Permission.class)
     public static Permission newInstance(String resource) {
         return new Permission(
                 null, resource,

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountRepositoryImpl.java

@@ -206,9 +206,9 @@ public class AccountRepositoryImpl extends JdbcRepositorySupport<Account, Long>
                 .addValue("password", entity.getPassword().value())
                 .addValue("salt", entity.getPassword().getSalt())
                 .addValue("avatar", accountInfo.getAvatar().toString())
-                .addValue("sex", accountInfo.getSex().getValue())
+                .addValue("sex", accountInfo.getSex().getId())
                 .addValue("nickname", getValueOrNull(accountInfo.getNickname()))
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("createdBy", entity.getCreatedBy())
                 .addValue("createTime", now)
                 .addValue("updatedBy", entity.getUpdatedBy())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/menu/MenuRepositoryImpl.java

@@ -188,7 +188,7 @@ public class MenuRepositoryImpl extends JdbcRepositorySupport<Menu, Long> implem
                 .addValue("icon", entity.getIcon())
                 .addValue("hidden", entity.isHidden())
                 .addValue("orderNumber", entity.getOrderNumber())
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("component", entity.getComponent())
                 .addValue("cache", entity.getCache())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/role/RoleRepositoryImpl.java

@@ -135,7 +135,7 @@ public class RoleRepositoryImpl extends JdbcRepositorySupport<Role, Long> implem
                 .addValue("id", id)
                 .addValue("name", entity.getName())
                 .addValue("identifier", entity.getIdentifier())
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("createTime", now)
                 .addValue("createdBy", loginId)