diff --git a/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java b/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java index c540d349..791dd8e0 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/base/BaseEntity.java @@ -1,8 +1,8 @@ package com.platform.boot.commons.base; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.Ulid; +import com.platform.boot.commons.utils.query.CriteriaUtils; import org.springframework.data.domain.Persistable; import org.springframework.data.relational.core.query.Criteria; import org.springframework.util.ObjectUtils; @@ -34,7 +34,7 @@ default void setCode(String code) { default boolean isNew() { boolean isNew = ObjectUtils.isEmpty(getId()); if (isNew) { - setCode(ContextUtils.nextId()); + setCode(Ulid.random()); } return isNew; } diff --git a/boot/platform/src/main/java/com/platform/boot/commons/exception/RestServerException.java b/boot/platform/src/main/java/com/platform/boot/commons/exception/RestServerException.java index 6e43beb3..ca0156cd 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/exception/RestServerException.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/exception/RestServerException.java @@ -13,8 +13,8 @@ @EqualsAndHashCode(callSuper = true) public class RestServerException extends RuntimeException implements Serializable { - protected Object msg; - protected int code; + private Object msg; + private int code; public RestServerException(int code, String message, Object msg) { super(message); @@ -23,7 +23,7 @@ public RestServerException(int code, String message, Object msg) { } public static RestServerException withMsg(String message, Object msg) { - return withMsg(5000, message, msg); + return withMsg(500, message, msg); } public static RestServerException withMsg(int code, String message, Object msg) { diff --git a/boot/platform/src/main/java/com/platform/boot/commons/ulid/Ulid.java b/boot/platform/src/main/java/com/platform/boot/commons/ulid/Ulid.java deleted file mode 100644 index a70ad94e..00000000 --- a/boot/platform/src/main/java/com/platform/boot/commons/ulid/Ulid.java +++ /dev/null @@ -1,522 +0,0 @@ -package com.platform.boot.commons.ulid; - -import com.platform.boot.commons.exception.RestServerException; - -import java.security.SecureRandom; -import java.util.Random; - -/** - * ULID string generator and parser class, using Crockford Base32 encoding. Only upper case letters - * are used for generation. Parsing allows upper and lower case letters, and i and l will be treated - * as 1 and o will be treated as 0.
- *
- * ULID generation examples:
- * - * 
- * String ulid1 = ULID.random();
- * String ulid2 = ULID.random(ThreadLocalRandom.current());
- * String ulid3 = ULID.random(SecureRandom.newInstance("SHA1PRNG"));
- * byte[] entropy = new byte[] {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9};
- * String ulid4 = ULID.generate(System.currentTimeMillis(), entropy);
- *
- *

- * ULID parsing examples:
- * - * 

- * String ulid = "003JZ9J6G80123456789abcdef";
- * assert ULID.isValid(ulid);
- * long ts = ULID.getTimestamp(ulid);
- * assert ts == 123456789000L;
- * byte[] entropy = ULID.getEntropy(ulid);
- *
- * - * @author azam - * @see Base32 Encoding - * @see ULID - */ -public class Ulid { - - private static final SecureRandom SECURE_RANDOM = new SecureRandom(); - /** - * ULID string length. - */ - public static final int ULID_LENGTH = 26; - - /** - * ULID binary length. - */ - public static final int ULID_BINARY_LENGTH = 16; - - /** - * ULID entropy byte length. - */ - public static final int ENTROPY_LENGTH = 10; - - /** - * Minimum allowed timestamp value. - */ - public static final long MIN_TIME = 0x0L; - - /** - * Maximum allowed timestamp value. Encoded value can encode up to 0x0003ffffffffffffL but ULID - * binary/byte representation states that timestamp will only be 48-bits. - */ - public static final long MAX_TIME = 0x0000ffffffffffffL; - - /** - * Base32 characters mapping - */ - private static final char[] C = new char[]{ - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, - 0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, - 0x47, 0x48, 0x4a, 0x4b, 0x4d, 0x4e, 0x50, 0x51, - 0x52, 0x53, 0x54, 0x56, 0x57, 0x58, 0x59, 0x5a - }; - - /** - * {@code char} to {@code byte} O(1) mapping with alternative chars mapping - */ - private static final byte[] V = new byte[]{ - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x03, - (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07, - (byte) 0x08, (byte) 0x09, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x0a, (byte) 0x0b, (byte) 0x0c, - (byte) 0x0d, (byte) 0x0e, (byte) 0x0f, (byte) 0x10, - (byte) 0x11, (byte) 0xff, (byte) 0x12, (byte) 0x13, - (byte) 0xff, (byte) 0x14, (byte) 0x15, (byte) 0xff, - (byte) 0x16, (byte) 0x17, (byte) 0x18, (byte) 0x19, - (byte) 0x1a, (byte) 0xff, (byte) 0x1b, (byte) 0x1c, - (byte) 0x1d, (byte) 0x1e, (byte) 0x1f, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0x0a, (byte) 0x0b, (byte) 0x0c, - (byte) 0x0d, (byte) 0x0e, (byte) 0x0f, (byte) 0x10, - (byte) 0x11, (byte) 0xff, (byte) 0x12, (byte) 0x13, - (byte) 0xff, (byte) 0x14, (byte) 0x15, (byte) 0xff, - (byte) 0x16, (byte) 0x17, (byte) 0x18, (byte) 0x19, - (byte) 0x1a, (byte) 0xff, (byte) 0x1b, (byte) 0x1c, - (byte) 0x1d, (byte) 0x1e, (byte) 0x1f, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, - (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff - }; - - /** - * Generate random ULID string using {@link Random} instance. - * - * @return ULID string - */ - public static String random() { - byte[] entropy = new byte[10]; - SECURE_RANDOM.nextBytes(entropy); - return generate(System.currentTimeMillis(), entropy); - } - - /** - * Generate random ULID binary using {@link Random} instance. - * - * @return ULID binary - */ - public static byte[] randomBinary() { - byte[] entropy = new byte[10]; - SecureRandom random = new SecureRandom(); - random.nextBytes(entropy); - return generateBinary(System.currentTimeMillis(), entropy); - } - - /** - * Generate random ULID string using provided {@link Random} instance. - * - * @param random {@link Random} instance - * @return ULID string - */ - public static String random(Random random) { - byte[] entropy = new byte[10]; - random.nextBytes(entropy); - return generate(System.currentTimeMillis(), entropy); - } - - /** - * Generate random ULID binary using provided {@link Random} instance. - * - * @param random {@link Random} instance - * @return ULID string - */ - public static byte[] randomBinary(Random random) { - byte[] entropy = new byte[10]; - random.nextBytes(entropy); - return generateBinary(System.currentTimeMillis(), entropy); - } - - /** - * Generate ULID string from Unix epoch timestamp in millisecond and entropy bytes. Throws - * {@link IllegalArgumentException} if timestamp is less than {@value #MIN_TIME}, is - * more than {@value #MAX_TIME}, or entropy bytes is null or less than 10 bytes. - * - * @param time Unix epoch timestamp in millisecond - * @param entropy Entropy bytes - * @return ULID string - */ - public static String generate(long time, byte[] entropy) { - if (time < MIN_TIME || time > MAX_TIME || entropy == null || entropy.length < ENTROPY_LENGTH) { - throw RestServerException.withMsg( - "Time is too long, or entropy is less than 10 bytes or null!", - "Time is too long, or entropy is less than 10 bytes or null!"); - } - - char[] chars = new char[26]; - - // time - chars[0] = C[((byte) (time >>> 45)) & 0x1f]; - chars[1] = C[((byte) (time >>> 40)) & 0x1f]; - chars[2] = C[((byte) (time >>> 35)) & 0x1f]; - chars[3] = C[((byte) (time >>> 30)) & 0x1f]; - chars[4] = C[((byte) (time >>> 25)) & 0x1f]; - chars[5] = C[((byte) (time >>> 20)) & 0x1f]; - chars[6] = C[((byte) (time >>> 15)) & 0x1f]; - chars[7] = C[((byte) (time >>> 10)) & 0x1f]; - chars[8] = C[((byte) (time >>> 5)) & 0x1f]; - chars[9] = C[((byte) (time)) & 0x1f]; - - // entropy - chars[10] = C[(byte) ((entropy[0] & 0xff) >>> 3)]; - chars[11] = C[(byte) (((entropy[0] << 2) | ((entropy[1] & 0xff) >>> 6)) & 0x1f)]; - chars[12] = C[(byte) (((entropy[1] & 0xff) >>> 1) & 0x1f)]; - chars[13] = C[(byte) (((entropy[1] << 4) | ((entropy[2] & 0xff) >>> 4)) & 0x1f)]; - chars[14] = C[(byte) (((entropy[2] << 1) | ((entropy[3] & 0xff) >>> 7)) & 0x1f)]; - chars[15] = C[(byte) (((entropy[3] & 0xff) >>> 2) & 0x1f)]; - chars[16] = C[(byte) (((entropy[3] << 3) | ((entropy[4] & 0xff) >>> 5)) & 0x1f)]; - chars[17] = C[(byte) (entropy[4] & 0x1f)]; - chars[18] = C[(byte) ((entropy[5] & 0xff) >>> 3)]; - chars[19] = C[(byte) (((entropy[5] << 2) | ((entropy[6] & 0xff) >>> 6)) & 0x1f)]; - chars[20] = C[(byte) (((entropy[6] & 0xff) >>> 1) & 0x1f)]; - chars[21] = C[(byte) (((entropy[6] << 4) | ((entropy[7] & 0xff) >>> 4)) & 0x1f)]; - chars[22] = C[(byte) (((entropy[7] << 1) | ((entropy[8] & 0xff) >>> 7)) & 0x1f)]; - chars[23] = C[(byte) (((entropy[8] & 0xff) >>> 2) & 0x1f)]; - chars[24] = C[(byte) (((entropy[8] << 3) | ((entropy[9] & 0xff) >>> 5)) & 0x1f)]; - chars[25] = C[(byte) (entropy[9] & 0x1f)]; - - return new String(chars); - } - - /** - * Generate ULID binary from Unix epoch timestamp in millisecond and entropy bytes. Throws - * {@link IllegalArgumentException} if timestamp is less than {@value #MIN_TIME}, is - * more than {@value #MAX_TIME}, or entropy bytes is null or less than 10 bytes. - * - * @param time Unix epoch timestamp in millisecond - * @param entropy Entropy bytes - * @return ULID string - */ - public static byte[] generateBinary(long time, byte[] entropy) { - if (time < MIN_TIME || time > MAX_TIME || entropy == null || entropy.length < ENTROPY_LENGTH) { - throw new IllegalArgumentException( - "Time is too long, or entropy is less than 10 bytes or null"); - } - - byte[] bytes = new byte[Ulid.ULID_BINARY_LENGTH]; - - // Long to big endian byte array up to 6 bytes - long ts = time; - for (int i = 5; i >= 0; i--) { - bytes[i] = (byte) (ts & 0xff); - ts = ts >>> 8; - } - - // Copy over bytes from entropy - System.arraycopy(entropy, 0, bytes, 6, 10); - - return bytes; - } - - /** - * Checks ULID string validity. - * - * @param ulid ULID string - * @return true if ULID string is valid - */ - public static boolean isValid(CharSequence ulid) { - if (ulid == null || ulid.length() != ULID_LENGTH) { - return false; - } - for (int i = 0; i < ULID_LENGTH; i++) { - /* We only care for chars between 0x00 and 0xff. */ - char c = ulid.charAt(i); - if (c > V.length || V[c] == (byte) 0xff) { - return false; - } - } - return true; - } - - /** - * Checks ULID binary validity. - * - * @param ulid ULID binary - * @return true if ULID binary is valid - */ - public static boolean isValidBinary(byte[] ulid) { - return ulid != null && ulid.length == ULID_BINARY_LENGTH; - } - - /** - * Extract and return the timestamp part from ULID string. Expects a valid ULID string. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string. - * - * @param ulid ULID string - * @return Unix epoch timestamp in millisecond - */ - public static long getTimestamp(CharSequence ulid) { - return (long) V[ulid.charAt(0)] << 45 - | (long) V[ulid.charAt(1)] << 40 - | (long) V[ulid.charAt(2)] << 35 - | (long) V[ulid.charAt(3)] << 30 - | (long) V[ulid.charAt(4)] << 25 - | (long) V[ulid.charAt(5)] << 20 - | (long) V[ulid.charAt(6)] << 15 - | (long) V[ulid.charAt(7)] << 10 - | (long) V[ulid.charAt(8)] << 5 - | (long) V[ulid.charAt(9)]; - } - - /** - * Extract and return the timestamp part from ULID binary. Expects a valid ULID binary. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string. - * - * @param ulid ULID string - * @return Unix epoch timestamp in millisecond - */ - public static long getTimestampBinary(byte[] ulid) { - long timestamp = ulid[0]; - timestamp = (timestamp << 8) | ulid[1] & 0xff; - timestamp = (timestamp << 8) | ulid[2] & 0xff; - timestamp = (timestamp << 8) | ulid[3] & 0xff; - timestamp = (timestamp << 8) | ulid[4] & 0xff; - timestamp = (timestamp << 8) | ulid[5] & 0xff; - return timestamp; - } - - /** - * Extract and return the entropy part from ULID string. Expects a valid ULID string. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string. - * - * @param ulid ULID string - * @return Entropy bytes - */ - public static byte[] getEntropy(CharSequence ulid) { - byte[] bytes = new byte[ENTROPY_LENGTH]; - bytes[0] = (byte) ((V[ulid.charAt(10)] << 3) - | (V[ulid.charAt(11)] & 0xff) >>> 2); - bytes[1] = (byte) ((V[ulid.charAt(11)] << 6) - | V[ulid.charAt(12)] << 1 - | (V[ulid.charAt(13)] & 0xff) >>> 4); - bytes[2] = (byte) ((V[ulid.charAt(13)] << 4) - | (V[ulid.charAt(14)] & 0xff) >>> 1); - bytes[3] = (byte) ((V[ulid.charAt(14)] << 7) - | V[ulid.charAt(15)] << 2 - | (V[ulid.charAt(16)] & 0xff) >>> 3); - bytes[4] = (byte) ((V[ulid.charAt(16)] << 5) - | V[ulid.charAt(17)]); - bytes[5] = (byte) ((V[ulid.charAt(18)] << 3) - | (V[ulid.charAt(19)] & 0xff) >>> 2); - bytes[6] = (byte) ((V[ulid.charAt(19)] << 6) - | V[ulid.charAt(20)] << 1 - | (V[ulid.charAt(21)] & 0xff) >>> 4); - bytes[7] = (byte) ((V[ulid.charAt(21)] << 4) - | (V[ulid.charAt(22)] & 0xff) >>> 1); - bytes[8] = (byte) ((V[ulid.charAt(22)] << 7) - | V[ulid.charAt(23)] << 2 - | (V[ulid.charAt(24)] & 0xff) >>> 3); - bytes[9] = (byte) ((V[ulid.charAt(24)] << 5) - | V[ulid.charAt(25)]); - return bytes; - } - - /** - * Extract and return the entropy part from ULID binary. Expects a valid ULID binary. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string. - * - * @param ulid ULID binary - * @return Entropy bytes - */ - public static byte[] getEntropyBinary(byte[] ulid) { - byte[] bytes = new byte[ENTROPY_LENGTH]; - System.arraycopy(ulid, 6, bytes, 0, 10); - return bytes; - } - - /** - * Convert a valid ULID string to it's binary representation. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string.
- *
- * Binary layout: - * - * 
-     * 0                   1                   2                   3
-     *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                      32_bit_uint_time_high                    |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |     16_bit_uint_time_low      |       16_bit_uint_random      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                       32_bit_uint_random                      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                       32_bit_uint_random                      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     *
- * - * @param ulid ULID string - * @return ULID binary - */ - public static byte[] toBinary(CharSequence ulid) { - byte[] bytes = new byte[ULID_BINARY_LENGTH]; - // Timestamp - bytes[0] = (byte) ((V[ulid.charAt(0)] << 5) - | V[ulid.charAt(1)]); - bytes[1] = (byte) ((V[ulid.charAt(2)] << 3) - | (V[ulid.charAt(3)] & 0xff) >>> 2); - bytes[2] = (byte) ((V[ulid.charAt(3)] << 6) - | V[ulid.charAt(4)] << 1 - | (V[ulid.charAt(5)] & 0xff) >>> 4); - bytes[3] = (byte) ((V[ulid.charAt(5)] << 4) - | (V[ulid.charAt(6)] & 0xff) >>> 1); - bytes[4] = (byte) ((V[ulid.charAt(6)] << 7) - | V[ulid.charAt(7)] << 2 - | (V[ulid.charAt(8)] & 0xff) >>> 3); - bytes[5] = (byte) ((V[ulid.charAt(8)] << 5) - | V[ulid.charAt(9)]); - // Entropy - bytes[6] = (byte) ((V[ulid.charAt(10)] << 3) - | (V[ulid.charAt(11)] & 0xff) >>> 2); - bytes[7] = (byte) ((V[ulid.charAt(11)] << 6) - | V[ulid.charAt(12)] << 1 - | (V[ulid.charAt(13)] & 0xff) >>> 4); - bytes[8] = (byte) ((V[ulid.charAt(13)] << 4) - | (V[ulid.charAt(14)] & 0xff) >>> 1); - bytes[9] = (byte) ((V[ulid.charAt(14)] << 7) - | V[ulid.charAt(15)] << 2 - | (V[ulid.charAt(16)] & 0xff) >>> 3); - bytes[10] = (byte) ((V[ulid.charAt(16)] << 5) - | V[ulid.charAt(17)]); - bytes[11] = (byte) ((V[ulid.charAt(18)] << 3) - | (V[ulid.charAt(19)] & 0xff) >>> 2); - bytes[12] = (byte) ((V[ulid.charAt(19)] << 6) - | V[ulid.charAt(20)] << 1 - | (V[ulid.charAt(21)] & 0xff) >>> 4); - bytes[13] = (byte) ((V[ulid.charAt(21)] << 4) - | (V[ulid.charAt(22)] & 0xff) >>> 1); - bytes[14] = (byte) ((V[ulid.charAt(22)] << 7) - | V[ulid.charAt(23)] << 2 - | (V[ulid.charAt(24)] & 0xff) >>> 3); - bytes[15] = (byte) ((V[ulid.charAt(24)] << 5) - | V[ulid.charAt(25)]); - return bytes; - } - - /** - * Convert a valid ULID binary representation to it's string representation. Call - * and check validity before calling this method - * if you do not trust the origin of the ULID string.
- *
- * Binary layout: - * - * 
-     * 0                   1                   2                   3
-     *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                      32_bit_uint_time_high                    |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |     16_bit_uint_time_low      |       16_bit_uint_random      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                       32_bit_uint_random                      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     * |                       32_bit_uint_random                      |
-     * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-     *
- * - * @param binary ULID binary - * @return ULID string - */ - public static String fromBinary(byte[] binary) { - char[] chars = new char[26]; - - //time - chars[0] = C[(byte) (((binary[0] & 0xff) >>> 5) & 0x1f)]; - chars[1] = C[(byte) (binary[0] & 0x1f)]; - chars[2] = C[(byte) ((binary[1] & 0xff) >>> 3)]; - chars[3] = C[(byte) (((binary[1] << 2) | ((binary[2] & 0xff) >>> 6)) & 0x1f)]; - chars[4] = C[(byte) (((binary[2] & 0xff) >>> 1) & 0x1f)]; - chars[5] = C[(byte) (((binary[2] << 4) | ((binary[3] & 0xff) >>> 4)) & 0x1f)]; - chars[6] = C[(byte) (((binary[3] << 1) | ((binary[4] & 0xff) >>> 7)) & 0x1f)]; - chars[7] = C[(byte) (((binary[4] & 0xff) >>> 2) & 0x1f)]; - chars[8] = C[(byte) (((binary[4] << 3) | ((binary[5] & 0xff) >>> 5)) & 0x1f)]; - chars[9] = C[(byte) (binary[5] & 0x1f)]; - - // entropy - chars[10] = C[(byte) ((binary[6] & 0xff) >>> 3)]; - chars[11] = C[(byte) (((binary[6] << 2) | ((binary[7] & 0xff) >>> 6)) & 0x1f)]; - chars[12] = C[(byte) (((binary[7] & 0xff) >>> 1) & 0x1f)]; - chars[13] = C[(byte) (((binary[7] << 4) | ((binary[8] & 0xff) >>> 4)) & 0x1f)]; - chars[14] = C[(byte) (((binary[8] << 1) | ((binary[9] & 0xff) >>> 7)) & 0x1f)]; - chars[15] = C[(byte) (((binary[9] & 0xff) >>> 2) & 0x1f)]; - chars[16] = C[(byte) (((binary[9] << 3) | ((binary[10] & 0xff) >>> 5)) & 0x1f)]; - chars[17] = C[(byte) (binary[10] & 0x1f)]; - chars[18] = C[(byte) ((binary[11] & 0xff) >>> 3)]; - chars[19] = C[(byte) (((binary[11] << 2) | ((binary[12] & 0xff) >>> 6)) & 0x1f)]; - chars[20] = C[(byte) (((binary[12] & 0xff) >>> 1) & 0x1f)]; - chars[21] = C[(byte) (((binary[12] << 4) | ((binary[13] & 0xff) >>> 4)) & 0x1f)]; - chars[22] = C[(byte) (((binary[13] << 1) | ((binary[14] & 0xff) >>> 7)) & 0x1f)]; - chars[23] = C[(byte) (((binary[14] & 0xff) >>> 2) & 0x1f)]; - chars[24] = C[(byte) (((binary[14] << 3) | ((binary[15] & 0xff) >>> 5)) & 0x1f)]; - chars[25] = C[(byte) (binary[15] & 0x1f)]; - - return new String(chars); - } -} \ No newline at end of file diff --git a/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java index 70f58f19..5f2f1950 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/utils/ContextUtils.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.platform.boot.commons.exception.JsonException; import com.platform.boot.commons.exception.RestServerException; -import com.platform.boot.commons.ulid.Ulid; import com.platform.boot.security.SecurityDetails; import com.platform.boot.security.core.UserAuditor; import com.platform.boot.security.core.user.UsersService; @@ -118,10 +117,6 @@ private static Mono handlePropertyDescriptor(T object, PropertyDescr } } - public static String nextId() { - return Ulid.random(); - } - @Override public void afterPropertiesSet() { log.info("Initializing utils [ContextUtils]..."); diff --git a/boot/platform/src/main/java/com/platform/boot/commons/utils/Ulid.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/Ulid.java new file mode 100644 index 00000000..dd0cc2c5 --- /dev/null +++ b/boot/platform/src/main/java/com/platform/boot/commons/utils/Ulid.java @@ -0,0 +1,117 @@ +package com.platform.boot.commons.utils; + +import com.platform.boot.commons.exception.RestServerException; + +import java.io.Serializable; +import java.security.SecureRandom; +import java.util.Random; + +/** + * ULID string generator and parser class, using Crockford Base32 encoding. Only upper case letters + * are used for generation. Parsing allows upper and lower case letters, and i and l will be treated + * as 1 and o will be treated as 0.
+ *
+ * ULID generation examples:
+ * + * 
+ * String ulid1 = ULID.random();
+ * String ulid2 = ULID.random(ThreadLocalRandom.current());
+ * String ulid3 = ULID.random(SecureRandom.newInstance("SHA1PRNG"));
+ * byte[] entropy = new byte[] {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9};
+ * String ulid4 = ULID.generate(System.currentTimeMillis(), entropy);
+ *
+ *

+ * ULID parsing examples:
+ * + * 

+ * String ulid = "003JZ9J6G80123456789abcdef";
+ * assert ULID.isValid(ulid);
+ * long ts = ULID.getTimestamp(ulid);
+ * assert ts == 123456789000L;
+ * byte[] entropy = ULID.getEntropy(ulid);
+ *
+ * + * @author azam + * @see Base32 Encoding + * @see ULID + */ +public class Ulid implements Serializable { + + private static final SecureRandom SECURE_RANDOM = new SecureRandom(); + + private static final int ENTROPY_LENGTH = 10; + + private static final long MIN_TIME = 0x0L; + + private static final long MAX_TIME = 0x0000ffffffffffffL; + + private static final char[] C = new char[]{ + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, + 0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, + 0x47, 0x48, 0x4a, 0x4b, 0x4d, 0x4e, 0x50, 0x51, + 0x52, 0x53, 0x54, 0x56, 0x57, 0x58, 0x59, 0x5a + }; + + /** + * Generate random UID string using {@link Random} instance. + * + * @return UID string + */ + public static String random() { + byte[] entropy = new byte[10]; + SECURE_RANDOM.nextBytes(entropy); + return generate(System.currentTimeMillis(), entropy); + } + + /** + * Generate UID string from Unix epoch timestamp in millisecond and entropy bytes. Throws + * {@link IllegalArgumentException} if timestamp is less than {@value #MIN_TIME}, is + * more than {@value #MAX_TIME}, or entropy bytes is null or less than 10 bytes. + * + * @param time Unix epoch timestamp in millisecond + * @param entropy Entropy bytes + * @return UID string + */ + public static String generate(long time, byte[] entropy) { + if (time < MIN_TIME || time > MAX_TIME || entropy == null || entropy.length < ENTROPY_LENGTH) { + throw RestServerException.withMsg( + "Time is too long, or entropy is less than 10 bytes or null!", + "Time is too long, or entropy is less than 10 bytes or null!"); + } + + char[] chars = new char[26]; + + // time + chars[0] = C[((byte) (time >>> 45)) & 0x1f]; + chars[1] = C[((byte) (time >>> 40)) & 0x1f]; + chars[2] = C[((byte) (time >>> 35)) & 0x1f]; + chars[3] = C[((byte) (time >>> 30)) & 0x1f]; + chars[4] = C[((byte) (time >>> 25)) & 0x1f]; + chars[5] = C[((byte) (time >>> 20)) & 0x1f]; + chars[6] = C[((byte) (time >>> 15)) & 0x1f]; + chars[7] = C[((byte) (time >>> 10)) & 0x1f]; + chars[8] = C[((byte) (time >>> 5)) & 0x1f]; + chars[9] = C[((byte) (time)) & 0x1f]; + + // entropy + chars[10] = C[(byte) ((entropy[0] & 0xff) >>> 3)]; + chars[11] = C[(byte) (((entropy[0] << 2) | ((entropy[1] & 0xff) >>> 6)) & 0x1f)]; + chars[12] = C[(byte) (((entropy[1] & 0xff) >>> 1) & 0x1f)]; + chars[13] = C[(byte) (((entropy[1] << 4) | ((entropy[2] & 0xff) >>> 4)) & 0x1f)]; + chars[14] = C[(byte) (((entropy[2] << 1) | ((entropy[3] & 0xff) >>> 7)) & 0x1f)]; + chars[15] = C[(byte) (((entropy[3] & 0xff) >>> 2) & 0x1f)]; + chars[16] = C[(byte) (((entropy[3] << 3) | ((entropy[4] & 0xff) >>> 5)) & 0x1f)]; + chars[17] = C[(byte) (entropy[4] & 0x1f)]; + chars[18] = C[(byte) ((entropy[5] & 0xff) >>> 3)]; + chars[19] = C[(byte) (((entropy[5] << 2) | ((entropy[6] & 0xff) >>> 6)) & 0x1f)]; + chars[20] = C[(byte) (((entropy[6] & 0xff) >>> 1) & 0x1f)]; + chars[21] = C[(byte) (((entropy[6] << 4) | ((entropy[7] & 0xff) >>> 4)) & 0x1f)]; + chars[22] = C[(byte) (((entropy[7] << 1) | ((entropy[8] & 0xff) >>> 7)) & 0x1f)]; + chars[23] = C[(byte) (((entropy[8] & 0xff) >>> 2) & 0x1f)]; + chars[24] = C[(byte) (((entropy[8] << 3) | ((entropy[9] & 0xff) >>> 5)) & 0x1f)]; + chars[25] = C[(byte) (entropy[9] & 0x1f)]; + + return new String(chars); + } + +} \ No newline at end of file diff --git a/boot/platform/src/main/java/com/platform/boot/commons/query/CriteriaUtils.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/CriteriaUtils.java similarity index 98% rename from boot/platform/src/main/java/com/platform/boot/commons/query/CriteriaUtils.java rename to boot/platform/src/main/java/com/platform/boot/commons/utils/query/CriteriaUtils.java index 187cec60..b1861316 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/query/CriteriaUtils.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/CriteriaUtils.java @@ -1,4 +1,4 @@ -package com.platform.boot.commons.query; +package com.platform.boot.commons.utils.query; import com.google.common.base.CaseFormat; import com.google.common.collect.Maps; @@ -30,7 +30,7 @@ public static String applyPage(Pageable pageable, String prefix) { public static String applySort(Sort sort, String prefix) { if (sort == null || sort.isUnsorted()) { - return " order by id "; + return " order by id desc "; } sort = QueryJson.sortJson(sort, prefix); StringJoiner sortSql = new StringJoiner(", "); diff --git a/boot/platform/src/main/java/com/platform/boot/commons/query/ParamSql.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/ParamSql.java similarity index 91% rename from boot/platform/src/main/java/com/platform/boot/commons/query/ParamSql.java rename to boot/platform/src/main/java/com/platform/boot/commons/utils/query/ParamSql.java index df74f3e8..ad4d39cc 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/query/ParamSql.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/ParamSql.java @@ -1,4 +1,4 @@ -package com.platform.boot.commons.query; +package com.platform.boot.commons.utils.query; import java.io.Serializable; import java.util.Map; diff --git a/boot/platform/src/main/java/com/platform/boot/commons/query/QueryJson.java b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/QueryJson.java similarity index 99% rename from boot/platform/src/main/java/com/platform/boot/commons/query/QueryJson.java rename to boot/platform/src/main/java/com/platform/boot/commons/utils/query/QueryJson.java index 1a9012ae..1201d2ce 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/query/QueryJson.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/utils/query/QueryJson.java @@ -1,4 +1,4 @@ -package com.platform.boot.commons.query; +package com.platform.boot.commons.utils.query; import com.google.common.base.CaseFormat; import com.google.common.collect.Lists; diff --git a/boot/platform/src/main/java/com/platform/boot/relational/logger/Logger.java b/boot/platform/src/main/java/com/platform/boot/relational/logger/Logger.java index 77e7cce4..72704f39 100644 --- a/boot/platform/src/main/java/com/platform/boot/relational/logger/Logger.java +++ b/boot/platform/src/main/java/com/platform/boot/relational/logger/Logger.java @@ -20,58 +20,25 @@ public class Logger implements BaseEntity { @Id private Long id; - /** - * The code associated with the logger entity. - */ private String code; - /** - * The tenant code associated with the logger entity. - */ private String tenantCode; - /** - * The operator associated with the logger entity. - */ private String operator; - /** - * The prefix associated with the logger entity. - */ private String prefix; - /** - * The URL associated with the logger entity. - */ private String url; - /** - * The HTTP method associated with the logger entity. - */ private String method; - /** - * The status associated with the logger entity. - */ private String status; - /** - * The context associated with the logger entity, stored as a JSON tree structure - * using the Jackson library's JsonNode class. - */ private JsonNode context; - /** - * The date and time when the logger entity was created, automatically populated - * by the @CreatedDate annotation provided by Spring Data. - */ @CreatedDate private LocalDateTime createdTime; - /** - * The date and time when the logger entity was last modified, automatically updated - * by the @LastModifiedDate annotation provided by Spring Data. - */ @LastModifiedDate private LocalDateTime updatedTime; } \ No newline at end of file diff --git a/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggerRequest.java b/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggerRequest.java index fe68ceae..fbfa1061 100644 --- a/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggerRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggerRequest.java @@ -20,18 +20,6 @@ public class LoggerRequest extends Logger { private String securityCode; - /** - * Factory method to create a LoggerRequest - * - * @param tenantCode the tenant code - * @param operator the operator - * @param prefix the prefix - * @param method the method - * @param status the status - * @param url the url - * @param context the context - * @return a LoggerRequest object - */ public static LoggerRequest of(String tenantCode, String operator, String prefix, String method, String status, String url, JsonNode context) { LoggerRequest request = new LoggerRequest(); @@ -45,20 +33,10 @@ public static LoggerRequest of(String tenantCode, String operator, String prefix return request; } - /** - * Method to convert this LoggerRequest to a Logger - * - * @return a Logger object - */ public Logger toLogger() { return BeanUtils.copyProperties(this, Logger.class); } - /** - * Method to convert this LoggerRequest to a Criteria - * - * @return a Criteria object - */ public Criteria toCriteria() { Criteria criteria = criteria(Set.of("securityCode", "context")); diff --git a/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggersRepository.java b/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggersRepository.java index 1418e538..683a7276 100644 --- a/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggersRepository.java +++ b/boot/platform/src/main/java/com/platform/boot/relational/logger/LoggersRepository.java @@ -10,11 +10,5 @@ */ public interface LoggersRepository extends R2dbcRepository { - /** - * 根据创建时间删除记录并返回删除的Logger实体流。 - * - * @param createdTime 限定的创建时间，删除所有创建时间早于该时间的记录。 - * @return Flux 返回一个Flux流，包含所有被删除的Logger实体。 - */ Mono deleteByCreatedTimeBefore(LocalDateTime createdTime); } \ No newline at end of file diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/AuthenticationToken.java b/boot/platform/src/main/java/com/platform/boot/security/core/AuthenticationToken.java index 2f7797ed..97a3c5a6 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/AuthenticationToken.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/AuthenticationToken.java @@ -5,16 +5,6 @@ import java.io.Serializable; -/** - * This class is used to create an AuthenticationToken object. - * It takes a WebSession object and generates a token, expires and lastAccessTime. - * Then, this can be used to implement customized authentication schemes. - * - * @param token Token used for authentication - * @param expires Expiry time of the token in seconds - * @param lastAccessTime Last access time of the token in epoch seconds - * @author Alex bob(Alex Bob) - */ public record AuthenticationToken(String token, Long expires, Long lastAccessTime, Object details) implements Serializable { diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/UserAuditorAware.java b/boot/platform/src/main/java/com/platform/boot/security/core/UserAuditorAware.java index ad4e7b04..c7b36c93 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/UserAuditorAware.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/UserAuditorAware.java @@ -13,5 +13,4 @@ public class UserAuditorAware implements ReactiveAuditorAware { public @NonNull Mono getCurrentAuditor() { return ContextUtils.securityDetails().map(UserAuditor::withDetails); } - } \ No newline at end of file diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupRequest.java b/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupRequest.java index ff0238f3..a05afad5 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupRequest.java @@ -1,8 +1,8 @@ package com.platform.boot.security.core.group; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java b/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java index 6691c6be..44d58b72 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java @@ -1,10 +1,10 @@ package com.platform.boot.security.core.group; import com.platform.boot.commons.base.AbstractDatabase; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMemberRequest.java b/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMemberRequest.java index 662e6115..af1a8d00 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMemberRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMemberRequest.java @@ -1,8 +1,8 @@ package com.platform.boot.security.core.group.member; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java b/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java index 2a7aa2c5..6e19fcc9 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java @@ -1,10 +1,10 @@ package com.platform.boot.security.core.group.member; import com.platform.boot.commons.base.AbstractDatabase; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantRequest.java b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantRequest.java index 358194a2..b97ad150 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantRequest.java @@ -1,8 +1,8 @@ package com.platform.boot.security.core.tenant; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java index 3e36f0b6..ca09e34a 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java @@ -1,10 +1,10 @@ package com.platform.boot.security.core.tenant; import com.platform.boot.commons.base.AbstractDatabase; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import com.platform.boot.security.core.tenant.member.TenantMembersRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMemberRequest.java b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMemberRequest.java index 5a7e1d21..266597fa 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMemberRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMemberRequest.java @@ -1,8 +1,8 @@ package com.platform.boot.security.core.tenant.member; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java index 0e15d609..af83ac5f 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java @@ -1,10 +1,10 @@ package com.platform.boot.security.core.tenant.member; import com.platform.boot.commons.base.AbstractDatabase; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/user/UserRequest.java b/boot/platform/src/main/java/com/platform/boot/security/core/user/UserRequest.java index 0dbae675..14ff62e6 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/user/UserRequest.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/user/UserRequest.java @@ -1,8 +1,8 @@ package com.platform.boot.security.core.user; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/user/UsersService.java b/boot/platform/src/main/java/com/platform/boot/security/core/user/UsersService.java index d9b12cfc..8c10dd96 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/core/user/UsersService.java +++ b/boot/platform/src/main/java/com/platform/boot/security/core/user/UsersService.java @@ -2,10 +2,10 @@ import com.platform.boot.commons.base.AbstractDatabase; import com.platform.boot.commons.exception.RestServerException; -import com.platform.boot.commons.query.CriteriaUtils; -import com.platform.boot.commons.query.ParamSql; import com.platform.boot.commons.utils.BeanUtils; import com.platform.boot.commons.utils.ContextUtils; +import com.platform.boot.commons.utils.query.CriteriaUtils; +import com.platform.boot.commons.utils.query.ParamSql; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/boot/platform/src/main/java/com/platform/boot/security/oauth2/Oauth2SuccessHandler.java b/boot/platform/src/main/java/com/platform/boot/security/oauth2/Oauth2SuccessHandler.java index 67195a52..8030bb6f 100644 --- a/boot/platform/src/main/java/com/platform/boot/security/oauth2/Oauth2SuccessHandler.java +++ b/boot/platform/src/main/java/com/platform/boot/security/oauth2/Oauth2SuccessHandler.java @@ -22,7 +22,7 @@ import static com.platform.boot.config.SessionConfiguration.X_REQUESTED_WITH; /** - * @author Alex bob(Alex Bob) + * @author Alex Bob */ @Component public class Oauth2SuccessHandler extends RedirectServerAuthenticationSuccessHandler {