From a17fdff5919aad03e699a01d29e017c8c4dad163 Mon Sep 17 00:00:00 2001 From: AlexBob Date: Wed, 13 Mar 2024 15:57:26 +0800 Subject: [PATCH] add module authorization server. --- boot/authorization/build.gradle | 6 ------ .../java/com/platform/boot/commons/query/CriteriaUtils.java | 2 +- .../main/java/com/platform/boot/commons/query/ParamSql.java | 2 +- .../src/main/java/com/platform/boot/commons/ulid/Ulid.java | 4 ++-- boot/platform/src/main/resources/application.yml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/boot/authorization/build.gradle b/boot/authorization/build.gradle index ec99fad1..365b9817 100644 --- a/boot/authorization/build.gradle +++ b/boot/authorization/build.gradle @@ -69,10 +69,4 @@ dependencies { tasks.named('test') { useJUnitPlatform() -} - -hibernate { - enhancement { - enableAssociationManagement = true - } } \ 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/query/CriteriaUtils.java index beef90b4..3bfe295c 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/query/CriteriaUtils.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/query/CriteriaUtils.java @@ -52,7 +52,7 @@ public static ParamSql buildParamSql(Object object, Collection skipKeys, Map objectMap = BeanUtils.beanToMap(object, false, true); if (ObjectUtils.isEmpty(objectMap)) { - return ParamSql.of(new StringJoiner(" AND "), Maps.newHashMap()); + return ParamSql.of(new StringJoiner(" and "), Maps.newHashMap()); } ParamSql jsonParamSql = QueryJson.queryJson((Map) objectMap.get("query"), prefix); Map params = jsonParamSql.params(); 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/query/ParamSql.java index df74f3e8..0df18b92 100644 --- a/boot/platform/src/main/java/com/platform/boot/commons/query/ParamSql.java +++ b/boot/platform/src/main/java/com/platform/boot/commons/query/ParamSql.java @@ -15,7 +15,7 @@ public static ParamSql of(StringJoiner sql, Map params) { public String whereSql() { if (this.sql.length() > 0) { - return " Where " + this.sql; + return " where " + this.sql; } return ""; } 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 index a70ad94e..02a91fbb 100644 --- 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 @@ -144,9 +144,9 @@ public class Ulid { }; /** - * Generate random ULID string using {@link Random} instance. + * Generate random UID string using {@link Random} instance. * - * @return ULID string + * @return UID string */ public static String random() { byte[] entropy = new byte[10]; diff --git a/boot/platform/src/main/resources/application.yml b/boot/platform/src/main/resources/application.yml index 6ef1f668..b0c596f6 100644 --- a/boot/platform/src/main/resources/application.yml +++ b/boot/platform/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: spring: threads.virtual.enabled: true - #main.keep-alive: true + main.keep-alive: true application.name: plate webflux.format: time: "HH:mm:ss"