Merge remote-tracking branch 'upstream/main'

ruibaby · Jun 30, 2024 · db410e0 · db410e0
2 parents d261f96 + 9410006
commit db410e0
Show file tree

Hide file tree

Showing 32 changed files with 174 additions and 424 deletions.
diff --git a/api-docs/openapi/v3_0/aggregated.json b/api-docs/openapi/v3_0/aggregated.json
@@ -2366,31 +2366,6 @@
         ]
       }
     },
-    "/apis/api.console.halo.run/v1alpha1/caches/{name}": {
-      "delete": {
-        "description": "Evict a cache.",
-        "operationId": "EvictCache",
-        "parameters": [
-          {
-            "description": "Cache name",
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content"
-          }
-        },
-        "tags": [
-          "CacheV1alpha1Console"
-        ]
-      }
-    },
     "/apis/api.console.halo.run/v1alpha1/comments": {
       "get": {
         "description": "List comments.",
@@ -19692,12 +19667,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },
@@ -21592,12 +21567,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },

diff --git a/api-docs/openapi/v3_0/apis_console.api_v1alpha1.json b/api-docs/openapi/v3_0/apis_console.api_v1alpha1.json
@@ -233,31 +233,6 @@
         ]
       }
     },
-    "/apis/api.console.halo.run/v1alpha1/caches/{name}": {
-      "delete": {
-        "description": "Evict a cache.",
-        "operationId": "EvictCache",
-        "parameters": [
-          {
-            "description": "Cache name",
-            "in": "path",
-            "name": "name",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "No Content"
-          }
-        },
-        "tags": [
-          "CacheV1alpha1Console"
-        ]
-      }
-    },
     "/apis/api.console.halo.run/v1alpha1/comments": {
       "get": {
         "description": "List comments.",
@@ -5166,12 +5141,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },
@@ -5677,12 +5652,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },

diff --git a/api-docs/openapi/v3_0/apis_extension.api_v1alpha1.json b/api-docs/openapi/v3_0/apis_extension.api_v1alpha1.json
@@ -10609,12 +10609,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },
@@ -11799,12 +11799,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },

diff --git a/api-docs/openapi/v3_0/apis_uc.api_v1alpha1.json b/api-docs/openapi/v3_0/apis_uc.api_v1alpha1.json
@@ -1582,12 +1582,12 @@
           },
           "visible": {
             "type": "string",
-            "default": "PUBLIC",
             "enum": [
               "PUBLIC",
               "INTERNAL",
               "PRIVATE"
-            ]
+            ],
+            "default": "PUBLIC"
           }
         }
       },

diff --git a/...run/halo/app/theme/router/ModelConst.java → ...run/halo/app/theme/router/ModelConst.java b/...run/halo/app/theme/router/ModelConst.java → ...run/halo/app/theme/router/ModelConst.java
@@ -9,5 +9,6 @@
 public enum ModelConst {
     ;
     public static final String TEMPLATE_ID = "_templateId";
+    public static final String POWERED_BY_HALO_TEMPLATE_ENGINE = "poweredByHaloTemplateEngine";
     public static final Integer DEFAULT_PAGE_SIZE = 10;
 }
diff --git a/application/src/main/java/run/halo/app/cache/CacheEndpoint.java b/application/src/main/java/run/halo/app/cache/CacheEndpoint.java
diff --git a/application/src/main/java/run/halo/app/cache/CachedResponse.java b/application/src/main/java/run/halo/app/cache/CachedResponse.java