From 045bc8cd139a92c576f773919358daa1519f0f85 Mon Sep 17 00:00:00 2001
From: AlexBob <5199840@qq.com>
Date: Thu, 18 Apr 2024 16:13:00 +0800
Subject: [PATCH] ng update @angular/material

---
 boot/authorization/build.gradle                          | 6 ++++++
 .../com/platform/boot/commons/query/CriteriaUtils.java   | 2 +-
 .../java/com/platform/boot/commons/query/ParamSql.java   | 2 +-
 .../main/java/com/platform/boot/commons/ulid/Ulid.java   | 4 ++--
 .../platform/boot/relational/menus/MenusController.java  | 2 +-
 boot/platform/src/main/resources/application-local.yml   | 9 +++++++--
 boot/platform/src/main/resources/application.yml         | 2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/boot/authorization/build.gradle b/boot/authorization/build.gradle
index 365b9817..ec99fad1 100644
--- a/boot/authorization/build.gradle
+++ b/boot/authorization/build.gradle
@@ -69,4 +69,10 @@ 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 3bfe295c..beef90b4 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<String> skipKeys,
 
         Map<String, Object> 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<String, Object>) objectMap.get("query"), prefix);
         Map<String, Object> 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 0df18b92..df74f3e8 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<String, Object> 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 02a91fbb..a70ad94e 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 UID string using {@link Random} instance.
+     * Generate random ULID string using {@link Random} instance.
      *
-     * @return UID string
+     * @return ULID string
      */
     public static String random() {
         byte[] entropy = new byte[10];
diff --git a/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusController.java b/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusController.java
index 3b646e22..d822a95d 100644
--- a/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusController.java
+++ b/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusController.java
@@ -45,7 +45,7 @@ public Flux<Menu> load(MenuRequest request) {
                     request.setRules(rules);
                 }
             }
-            return this.search(request);
+            return this.menusService.search(request).distinct(Menu::getAuthority);
         });
     }
 
diff --git a/boot/platform/src/main/resources/application-local.yml b/boot/platform/src/main/resources/application-local.yml
index d00a0783..bbe4e265 100644
--- a/boot/platform/src/main/resources/application-local.yml
+++ b/boot/platform/src/main/resources/application-local.yml
@@ -22,11 +22,16 @@ spring:
       max-create-connection-time: 2s
       max-validation-time: 2s
   sql.init:
-    mode: never
+    mode: always
     platform: postgres
     encoding: utf-8
   data.redis:
     host: 127.0.0.1
     timeout: 30s
     connect-timeout: 10s
-    repositories.enabled: false
\ No newline at end of file
+    repositories.enabled: false
+  security.oauth2.client.registration:
+    github:
+      client-id: Iv1.14a97a700a228437
+      client-secret: 94d4fa39efc5677ea75f5dfae533191c00f76f99
+      scope: user
\ No newline at end of file
diff --git a/boot/platform/src/main/resources/application.yml b/boot/platform/src/main/resources/application.yml
index b0c596f6..6ef1f668 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"