Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.12.9 #223

Merged
merged 4 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erupt-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-node-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-node/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-cloud/erupt-cloud-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 2 additions & 0 deletions erupt-core/src/main/java/xyz/erupt/core/cache/EruptCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public V get(String key) {
return expireNode.value;
}

@Override
public void delete(String key) {
try {
lock.writeLock().lock();
Expand Down
1 change: 1 addition & 0 deletions erupt-core/src/main/resources/i18n/erupt.i18n.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion erupt-data/erupt-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-data/erupt-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-excel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-extra/erupt-flow/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-extra/erupt-generator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-extra/erupt-job/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-extra/erupt-magic-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-extra/erupt-monitor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-security/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-toolkit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
2 changes: 1 addition & 1 deletion erupt-tpl-ui/amis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/ant-design/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/element-plus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion erupt-tpl-ui/element-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion erupt-tpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-upms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion erupt-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

2 changes: 1 addition & 1 deletion erupt-web/src/main/resources/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Large diffs are not rendered by default.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading