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/route/strategy/ExecutorRouteFailover.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java index a2e4c90..a889fad 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java @@ -26,13 +26,13 @@ beatResult = executorBiz.beat(); } catch (Exception e) { logger.error(e.getMessage(), e); - beatResult = new ReturnT<String>(ReturnT.FAIL_CODE, ""+e ); + beatResult = new ReturnT<String>(ReturnT.FAIL_CODE, "" + e); } - beatResultSB.append( (beatResultSB.length()>0)?"<br><br>":"") - .append(I18nUtil.getString("jobconf_beat") + "锛�") - .append("<br>address锛�").append(address) - .append("<br>code锛�").append(beatResult.getCode()) - .append("<br>msg锛�").append(beatResult.getMsg()); + beatResultSB.append((beatResultSB.length() > 0) ? "<br><br>" : "") + .append(I18nUtil.getString("jobconf_beat") + "锛�") + .append("<br>address锛�").append(address) + .append("<br>code锛�").append(beatResult.getCode()) + .append("<br>msg锛�").append(beatResult.getMsg()); // beat success if (beatResult.getCode() == ReturnT.SUCCESS_CODE) { -- Gitblit v1.9.3