Skip to content

Commit b432b02

Browse files
eruptserupts
authored
Merge pull request #223 from erupts/develop
1.12.9
2 parents 53dab2d + 4ea3f29 commit b432b02

File tree

39 files changed

+41
-31
lines changed

39 files changed

+41
-31
lines changed

‎erupt-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-annotation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>xyz.erupt</groupId>
1313
<artifactId>erupt</artifactId>
14-
<version>1.12.8</version>
14+
<version>1.12.9</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717
</project>

‎erupt-cloud/erupt-cloud-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-node-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-node/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-core/src/main/java/xyz/erupt/core/cache/EruptCache.java

+2
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ default V getAndSet(String key, long timeout, Supplier<V> supplier) {
1717
return Optional.ofNullable(this.get(key)).orElseGet(() -> this.put(key, supplier.get(), timeout));
1818
}
1919

20+
void delete(String key);
21+
2022
}

‎erupt-core/src/main/java/xyz/erupt/core/cache/EruptCacheLRU.java

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public V get(String key) {
5959
return expireNode.value;
6060
}
6161

62+
@Override
6263
public void delete(String key) {
6364
try {
6465
lock.writeLock().lock();

‎erupt-core/src/main/resources/i18n/erupt.i18n.csv

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ erupt.upload_error.image_width,上传失败，图片宽度不在范围内,上傳
1717
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"
1818
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"
1919
erupt.data.data_duplication,数据重复,數據重復,Data duplication,Duplication des données,データが重複します。,데이터가 중복되다.,Повторение данных,Duplicación de datos
20+
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
2021
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
2122
创建人,创建人,創建人,founder,Le créateur,設立者です,창립자,Создатель.,creador
2223
创建时间,创建时间,創建時間,Creation time,Temps de création,作成時間です,만든 시간,Создание времени,Hora de creación

‎erupt-data/erupt-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.8</version>
8+
<version>1.12.9</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

‎erupt-data/erupt-mongodb/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-excel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-extra/erupt-flow/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.8</version>
8+
<version>1.12.9</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

‎erupt-extra/erupt-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.8</version>
8+
<version>1.12.9</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

‎erupt-extra/erupt-job/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-extra/erupt-magic-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>xyz.erupt</groupId>
1515
<artifactId>erupt</artifactId>
16-
<version>1.12.8</version>
16+
<version>1.12.9</version>
1717
<relativePath>../../pom.xml</relativePath>
1818
</parent>
1919

‎erupt-extra/erupt-monitor/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-sample/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>xyz.erupt</groupId>
88
<artifactId>erupt</artifactId>
9-
<version>1.12.8</version>
9+
<version>1.12.9</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎erupt-security/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-toolkit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-toolkit/src/main/java/xyz/erupt/toolkit/service/EruptCacheRedis.java

+6
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@ public V get(String key) {
2828
return GsonFactory.getGson().fromJson(stringRedisTemplate.opsForValue().get(key), new TypeToken<V>() {
2929
}.getType());
3030
}
31+
32+
@Override
33+
public void delete(String key) {
34+
stringRedisTemplate.delete(key);
35+
}
36+
3137
}

‎erupt-tpl-ui/amis/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>xyz.erupt</groupId>
1515
<artifactId>erupt</artifactId>
16-
<version>1.12.8</version>
16+
<version>1.12.9</version>
1717
<relativePath>../../pom.xml</relativePath>
1818
</parent>
1919
</project>

‎erupt-tpl-ui/ant-design/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>xyz.erupt</groupId>
1515
<artifactId>erupt</artifactId>
16-
<version>1.12.8</version>
16+
<version>1.12.9</version>
1717
<relativePath>../../pom.xml</relativePath>
1818
</parent>
1919
</project>

‎erupt-tpl-ui/element-plus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>xyz.erupt</groupId>
1414
<artifactId>erupt</artifactId>
15-
<version>1.12.8</version>
15+
<version>1.12.9</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818
</project>

‎erupt-tpl-ui/element-ui/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>xyz.erupt</groupId>
1616
<artifactId>erupt</artifactId>
17-
<version>1.12.8</version>
17+
<version>1.12.9</version>
1818
<relativePath>../../pom.xml</relativePath>
1919
</parent>
2020
</project>

‎erupt-tpl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.8</version>
13+
<version>1.12.9</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-upms/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.8</version>
12+
<version>1.12.9</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-web/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>xyz.erupt</groupId>
1313
<artifactId>erupt</artifactId>
14-
<version>1.12.8</version>
14+
<version>1.12.9</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717

‎erupt-web/src/main/resources/public/497.12d79ebcd0674726.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎erupt-web/src/main/resources/public/497.45650efc6ec92f5e.js

-1
This file was deleted.

‎erupt-web/src/main/resources/public/830.0f4d54f53d4ae56a.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎erupt-web/src/main/resources/public/830.20510affa98b4d83.js

-1
This file was deleted.

‎erupt-web/src/main/resources/public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@
4848
</div>
4949
<![endif]-->
5050
<app-root></app-root>
51-
<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>
51+
<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>
5252
</html>

‎erupt-web/src/main/resources/public/main.c47a9568c0a85f71.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎erupt-web/src/main/resources/public/main.e102006835eec820.js

-1
This file was deleted.

‎erupt-web/src/main/resources/public/runtime.8279e246a28e886d.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎erupt-web/src/main/resources/public/runtime.a1480360b834a0ba.js

-1
This file was deleted.

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.8</version>
8+
<version>1.12.9</version>
99

1010
<packaging>pom</packaging>
1111
<name>erupt</name>

0 commit comments

Comments
 (0)