Merge pull request #37 from vnobo/dev

Dev
vnobo · Dec 17, 2024 · fb98cbc · fb98cbc
2 parents 9b9ab45 + 9af253e
commit fb98cbc
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 26 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -13,10 +13,15 @@ on:
     types: [ created ]
 env:
   GITHUB_REGISTRY: ghcr.io/${{ github.actor }}
-  DOCKER_REGISTRY: alexbob
+  DOCKER_REGISTRY: docker.io/alexbob
 jobs:
   boot-build-image:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     permissions:
       contents: read
       packages: write
@@ -25,6 +30,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
       - name: Set up graalvm 21 for x64
         uses: graalvm/setup-graalvm@v1
         with:
@@ -33,10 +39,24 @@ jobs:
           distribution: 'liberica'
           native-image-job-reports: 'true'
           cache: 'gradle'
-      - name: Execute Gradle platform bootBuildImage
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+
+      - name: Execute Gradle Plate bootBuildImage
         run: |
           chmod +x ./gradlew
-          ./gradlew bootBuildImage
+          ./gradlew bootBuildImage --imagePlatform=linux/amd64 --network=host --publishImage
+          ./gradlew bootBuildImage --imagePlatform=linux/arm64 --network=host --publishImage
+      - name: Inspect
+        run: |
+          docker buildx imagetools inspect localhost:5000/plate-oauth2:latest
+          docker buildx imagetools inspect localhost:5000/plate-platform:latest
 
       - name: Log into registry ${{ env.GITHUB_REGISTRY }}
         if: github.event_name != 'pull_request'
@@ -70,6 +90,7 @@ jobs:
       - name: Build and Push Platform
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: ./boot/platform
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -93,6 +114,7 @@ jobs:
       - name: Build and Push Oauth2
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: ./boot/oauth2
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.oauth2.outputs.tags }}

diff --git a/boot/oauth2/Dockerfile b/boot/oauth2/Dockerfile
@@ -1,4 +1,4 @@
-FROM plate-oauth2
+FROM localhost:5000/plate-oauth2:latest
 
 LABEL org.opencontainers.image.source=https://github.com/vnobo/plate
 LABEL org.opencontainers.image.description="Plate oauth2 container image"

diff --git a/boot/platform/Dockerfile b/boot/platform/Dockerfile
@@ -1,4 +1,4 @@
-FROM plate-platform
+FROM localhost:5000/plate-platform:latest
 
 LABEL org.opencontainers.image.source=https://github.com/vnobo/plate
 LABEL org.opencontainers.image.description="Plate platform container image"

diff --git a/boot/platform/src/main/java/com/plate/boot/commons/utils/query/QueryHelper.java b/boot/platform/src/main/java/com/plate/boot/commons/utils/query/QueryHelper.java
@@ -43,7 +43,6 @@ public static QueryFragment query(Object object, Pageable pageable, String prefi
         return query(object, pageable, List.of(), prefix);
     }
 
-    @SuppressWarnings("unchecked")
     public static QueryFragment query(Object object, Pageable pageable, Collection<String> skipKeys, String prefix) {
         Map<String, Object> objectMap = BeanUtils.beanToMap(object, false, true);
         Map<String, Object> filterMap = ObjectUtils.isEmpty(objectMap) ? Map.of() :
@@ -58,36 +57,42 @@ public static QueryFragment query(Object object, Pageable pageable, Collection<S
             return queryFragment;
         }
 
-        String queryKey = "query";
-        if (objectMap.containsKey(queryKey)) {
-            Map<String, Object> jsonMap = (Map<String, Object>) objectMap.get(queryKey);
-            QueryFragment jsonQueryFragment = QueryJsonHelper.queryJson(jsonMap, prefix);
+        processQueryKey(queryFragment, objectMap, prefix);
+        processSecurityCodeKey(queryFragment, objectMap, skipKeys, prefix);
+        processSearchKey(queryFragment, objectMap, prefix);
+
+        return queryFragment;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void processQueryKey(QueryFragment queryFragment, Map<String, Object> objectMap, String prefix) {
+        if (objectMap.containsKey("query")) {
+            var jsonMap = (Map<String, Object>) objectMap.get("query");
+            var jsonQueryFragment = QueryJsonHelper.queryJson(jsonMap, prefix);
             queryFragment.mergeWhere(jsonQueryFragment.getWhereSql());
             queryFragment.putAll(jsonQueryFragment);
         }
+    }
 
-        String securityCodeKey = "securityCode";
-        if (!skipKeys.contains(securityCodeKey) && objectMap.containsKey(securityCodeKey)) {
-            String key = "tenant_code";
-            if (StringUtils.hasLength(prefix)) {
-                key = prefix + "." + key;
-            }
+    private static void processSecurityCodeKey(QueryFragment queryFragment, Map<String, Object> objectMap, Collection<String> skipKeys, String prefix) {
+        if (!skipKeys.contains("securityCode") && objectMap.containsKey("securityCode")) {
+            var key = StringUtils.hasLength(prefix) ? prefix + ".tenant_code" : "tenant_code";
             queryFragment.addWhere(key + " LIKE :securityCode");
-            queryFragment.put("securityCode", objectMap.get(securityCodeKey));
+            queryFragment.put("securityTypeCode", objectMap.get("securityCode"));
         }
+    }
 
-        String searchKey = "search";
-        if (objectMap.containsKey(searchKey) && !ObjectUtils.isEmpty(objectMap.get(searchKey))) {
-            String textSearch = (String) objectMap.get(searchKey);
-            queryFragment.addColumn("TS_RANK_CD(text_search, queryTextSearch) AS rank");
+    private static void processSearchKey(QueryFragment queryFragment, Map<String, Object> objectMap, String prefix) {
+        if (objectMap.containsKey("search") && !ObjectUtils.isEmpty(objectMap.get("search"))) {
+            var textSearch = (String) objectMap.get("search");
+            var column = StringUtils.hasLength(prefix) ? prefix + ".text_search" : "text_search";
+            queryFragment.addColumn("TS_RANK_CD(" + column + ", queryTextSearch) AS rank");
             queryFragment.addQuery(",TO_TSQUERY('chinese',:textSearch) queryTextSearch");
-            queryFragment.addWhere("text_search @@ TO_TSQUERY('chinese',:textSearch)");
+            queryFragment.addWhere(column + " @@ TO_TSQUERY('chinese',:textSearch)");
             queryFragment.put("textSearch", textSearch);
         }
-        return queryFragment;
     }
 
-
     public static void applySort(QueryFragment queryFragment, Sort sort, String prefix) {
         sort = QueryJsonHelper.transformSortForJson(sort);
         for (Sort.Order order : sort) {
@@ -112,7 +117,7 @@ public static void applyWhere(QueryFragment queryFragment, String prefix) {
      * If the object does not have a table annotation, it throws a QueryException.
      *
      * @param queryFragment The QueryFragment to which the query SQL will be applied.
-     * @param object The object containing the table annotation and data for the query.
+     * @param object        The object containing the table annotation and data for the query.
      * @throws QueryException If the object does not have a table annotation.
      */
     public static void applyQuerySql(QueryFragment queryFragment, Object object) {

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ configure(subprojects - project(":boot")) { project ->
 
     tasks.named("bootBuildImage") {
         createdDate = "now"
-        imageName = "${rootProject.name}-${project.name}"
+        imageName = "localhost:5000/${rootProject.name}-${project.name}:latest"
         environment = [
                 "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ",
                 "BPE_APPEND_JAVA_TOOL_OPTIONS": "-Dfile.encoding=UTF-8 " +