Merge pull request #223 from erupts/develop

1.12.9
erupts · Dec 10, 2023 · b432b02 · b432b02
2 parents 53dab2d + 4ea3f29
commit b432b02
Show file tree

Hide file tree

Showing 39 changed files with 41 additions and 31 deletions.
diff --git a/erupt-admin/pom.xml b/erupt-admin/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-annotation/pom.xml b/erupt-annotation/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-cloud/erupt-cloud-common/pom.xml b/erupt-cloud/erupt-cloud-common/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node-jpa/pom.xml b/erupt-cloud/erupt-cloud-node-jpa/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-node/pom.xml b/erupt-cloud/erupt-cloud-node/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-cloud/erupt-cloud-server/pom.xml b/erupt-cloud/erupt-cloud-server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/pom.xml b/erupt-core/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-core/src/main/java/xyz/erupt/core/cache/EruptCache.java b/erupt-core/src/main/java/xyz/erupt/core/cache/EruptCache.java
@@ -17,4 +17,6 @@ default V getAndSet(String key, long timeout, Supplier<V> supplier) {
         return Optional.ofNullable(this.get(key)).orElseGet(() -> this.put(key, supplier.get(), timeout));
     }
 
+    void delete(String key);
+
 }
diff --git a/erupt-core/src/main/java/xyz/erupt/core/cache/EruptCacheLRU.java b/erupt-core/src/main/java/xyz/erupt/core/cache/EruptCacheLRU.java
@@ -59,6 +59,7 @@ public V get(String key) {
         return expireNode.value;
     }
 
+    @Override
     public void delete(String key) {
         try {
             lock.writeLock().lock();

diff --git a/erupt-core/src/main/resources/i18n/erupt.i18n.csv b/erupt-core/src/main/resources/i18n/erupt.i18n.csv
@@ -17,6 +17,7 @@ erupt.upload_error.image_width,上传失败，图片宽度不在范围内,上傳
 erupt.upload_error.image_height,上传失败，图片高度不在范围内,上傳失敗，圖片高度不在範圍內,"Upload failed, image height is not in range","Le téléchargement a échoué, la hauteur de l’image n’est pas dans la plage",アップロードに失敗した場合、画像の高さが範囲にありません。,그림 높이가범위에 없으므로 업로드에 실패했습니다,"Загрузка не удалась, высота изображения не в пределах диапазона","La subida falló, la altura de la imagen no está dentro del"
 erupt.data.delete_fail_by_associated_data,删除失败，可能存在关联数据，无法直接删除,刪除失敗，可能存在關聯數據，無法直接刪除,The deletion fails because associated data may exist and cannot be directly deleted,"La suppression a échoué, des données liées peuvent exister et ne peuvent pas être supprimées directement",削除失敗、関連データがある可能性があり、直接削除できません。,삭제에 실패했습니다. 관련된 데이터가 있을 수 있으므로 직접 삭제할 수 없습니다,"Удаление провалов может иметь корреляционные данные, которые не могут быть удалены непосредственно","La eliminación falló, puede haber datos asociados y no se puede eliminar directamente"
 erupt.data.data_duplication,数据重复,數據重復,Data duplication,Duplication des données,データが重複します。,데이터가 중복되다.,Повторение данных,Duplicación de datos
+erupt.data.delete_fail_may_be_associated_data,删除失败，可能存在关联数据,刪除失敗，可能存在關聯數據,The deletion failed because associated data may exist,"La suppression a échoué, des données associées peuvent exister",削除失敗、関連データがある可能性があります,연결된 데이터가 있을 수 있으므로 삭제에 실패했습니다,Удаление провалов может быть связано с данными,Cancellazione non avvenuta
 erupt.data.limit_length,内容超出数据库限制长度,內容超出數據庫限製長度,The content exceeds the database limit length,Contenu au-delà de la longueur limite de la base de données,コンテンツがデータベースの制限長を超えています,내용이 데이타베이스 제한을 초과했습니다,Содержание вне предельной длины базы данных,Contenido fuera del límite de longitud de base de datos
 创建人,创建人,創建人,founder,Le créateur,設立者です,창립자,Создатель.,creador
 创建时间,创建时间,創建時間,Creation time,Temps de création,作成時間です,만든 시간,Создание времени,Hora de creación

diff --git a/erupt-data/erupt-jpa/pom.xml b/erupt-data/erupt-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-data/erupt-mongodb/pom.xml b/erupt-data/erupt-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-excel/pom.xml b/erupt-excel/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-flow/pom.xml b/erupt-extra/erupt-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-generator/pom.xml b/erupt-extra/erupt-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-job/pom.xml b/erupt-extra/erupt-job/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-magic-api/pom.xml b/erupt-extra/erupt-magic-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-extra/erupt-monitor/pom.xml b/erupt-extra/erupt-monitor/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-sample/pom.xml b/erupt-sample/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>xyz.erupt</groupId>
 		<artifactId>erupt</artifactId>
-		<version>1.12.8</version>
+		<version>1.12.9</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/erupt-security/pom.xml b/erupt-security/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-toolkit/pom.xml b/erupt-toolkit/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-toolkit/src/main/java/xyz/erupt/toolkit/service/EruptCacheRedis.java b/erupt-toolkit/src/main/java/xyz/erupt/toolkit/service/EruptCacheRedis.java
@@ -28,4 +28,10 @@ public V get(String key) {
         return GsonFactory.getGson().fromJson(stringRedisTemplate.opsForValue().get(key), new TypeToken<V>() {
         }.getType());
     }
+
+    @Override
+    public void delete(String key) {
+        stringRedisTemplate.delete(key);
+    }
+
 }
diff --git a/erupt-tpl-ui/amis/pom.xml b/erupt-tpl-ui/amis/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/ant-design/pom.xml b/erupt-tpl-ui/ant-design/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/element-plus/pom.xml b/erupt-tpl-ui/element-plus/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl-ui/element-ui/pom.xml b/erupt-tpl-ui/element-ui/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 </project>
diff --git a/erupt-tpl/pom.xml b/erupt-tpl/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-upms/pom.xml b/erupt-upms/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-web/pom.xml b/erupt-web/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>xyz.erupt</groupId>
         <artifactId>erupt</artifactId>
-        <version>1.12.8</version>
+        <version>1.12.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/erupt-web/src/main/resources/public/497.12d79ebcd0674726.js b/erupt-web/src/main/resources/public/497.12d79ebcd0674726.js
diff --git a/erupt-web/src/main/resources/public/497.45650efc6ec92f5e.js b/erupt-web/src/main/resources/public/497.45650efc6ec92f5e.js
diff --git a/erupt-web/src/main/resources/public/830.0f4d54f53d4ae56a.js b/erupt-web/src/main/resources/public/830.0f4d54f53d4ae56a.js
diff --git a/erupt-web/src/main/resources/public/830.20510affa98b4d83.js b/erupt-web/src/main/resources/public/830.20510affa98b4d83.js
diff --git a/erupt-web/src/main/resources/public/index.html b/erupt-web/src/main/resources/public/index.html
@@ -48,5 +48,5 @@
 </div>
 <![endif]-->
 <app-root></app-root>
-<script src="runtime.a1480360b834a0ba.js" type="module"></script><script src="polyfills.014bc5f2f71c0b3f.js" type="module"></script><script src="main.e102006835eec820.js" type="module"></script></body>
+<script src="runtime.8279e246a28e886d.js" type="module"></script><script src="polyfills.014bc5f2f71c0b3f.js" type="module"></script><script src="main.c47a9568c0a85f71.js" type="module"></script></body>
 </html>
diff --git a/erupt-web/src/main/resources/public/main.c47a9568c0a85f71.js b/erupt-web/src/main/resources/public/main.c47a9568c0a85f71.js
diff --git a/erupt-web/src/main/resources/public/main.e102006835eec820.js b/erupt-web/src/main/resources/public/main.e102006835eec820.js
diff --git a/erupt-web/src/main/resources/public/runtime.8279e246a28e886d.js b/erupt-web/src/main/resources/public/runtime.8279e246a28e886d.js
diff --git a/erupt-web/src/main/resources/public/runtime.a1480360b834a0ba.js b/erupt-web/src/main/resources/public/runtime.a1480360b834a0ba.js
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>xyz.erupt</groupId>
     <artifactId>erupt</artifactId>
-    <version>1.12.8</version>
+    <version>1.12.9</version>
 
     <packaging>pom</packaging>
     <name>erupt</name>