From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
index 772a96e..4c8cc5c 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java
@@ -23,7 +23,8 @@
private static Logger logger = LoggerFactory.getLogger(I18nUtil.class);
private static Properties prop = null;
- public static Properties loadI18nProp(){
+
+ public static Properties loadI18nProp() {
if (prop != null) {
return prop;
}
@@ -34,7 +35,7 @@
// load prop
Resource resource = new ClassPathResource(i18nFile);
- EncodedResource encodedResource = new EncodedResource(resource,"UTF-8");
+ EncodedResource encodedResource = new EncodedResource(resource, "UTF-8");
prop = PropertiesLoaderUtils.loadProperties(encodedResource);
} catch (IOException e) {
logger.error(e.getMessage(), e);
@@ -62,12 +63,12 @@
Map<String, String> map = new HashMap<String, String>();
Properties prop = loadI18nProp();
- if (keys!=null && keys.length>0) {
- for (String key: keys) {
+ if (keys != null && keys.length > 0) {
+ for (String key : keys) {
map.put(key, prop.getProperty(key));
}
} else {
- for (String key: prop.stringPropertyNames()) {
+ for (String key : prop.stringPropertyNames()) {
map.put(key, prop.getProperty(key));
}
}
--
Gitblit v1.9.3