From 599be64fa82e88f3c638099cad3fb000234f234d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 7 Sep 2020 16:40:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=87=E7=BA=A7jjwt=E5=88=B00.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4302e8cb..0ab66e60 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.3.3 3.17 1.7 - 0.9.0 + 0.9.1 From 9fccc7de40405d227bf44d68a84a02edbcbcca94 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 7 Sep 2020 16:40:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java index 8e0048be..e9b80711 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -88,7 +88,7 @@ public class SysJob extends BaseEntity implements Serializable } @NotBlank(message = "调用目标字符串不能为空") - @Size(min = 0, max = 1000, message = "调用目标字符串长度不能超过500个字符") + @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") public String getInvokeTarget() { return invokeTarget; From 965290695431a4f8b611900f715541e8ac3b00b1 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 9 Sep 2020 10:08:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=99=8D=E7=BA=A7druid=E5=88=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACv1.1.22=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ab66e60..f706acc2 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 1.3.2 - 1.1.23 + 1.1.22 1.19 2.9.2 2.3.2 From 33793d8eff54f65c7837b2f82bc849ca2ffa6e0c Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 9 Sep 2020 11:30:34 +0800 Subject: [PATCH 4/7] =?UTF-8?q?Excel=E5=AF=BC=E5=87=BA=E7=B1=BB=E5=9E=8BNU?= =?UTF-8?q?MERIC=E6=94=AF=E6=8C=81=E7=B2=BE=E5=BA=A6=E6=B5=AE=E7=82=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 4e93c6cf..43e52daf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -503,7 +503,7 @@ public class ExcelUtil else if (ColumnType.NUMERIC == attr.cellType()) { cell.setCellType(CellType.NUMERIC); - cell.setCellValue(Integer.parseInt(value + "")); + cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); } } From aeb02c79d83d3720506fc7b6cbc419fe3dc58030 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 10 Sep 2020 16:53:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/domain/vo/MetaVo.java | 2 +- ruoyi-ui/src/router/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java index e83ef10c..d4661dd3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -13,7 +13,7 @@ public class MetaVo private String title; /** - * 设置该路由的图标，对应路径src/icons/svg + * 设置该路由的图标，对应路径src/assets/icons/svg */ private String icon; diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 59238d96..70755e87 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -19,7 +19,7 @@ import Layout from '@/layout' * meta : { roles: ['admin','editor'] // 设置该路由进入的权限，支持多个权限叠加 title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 - icon: 'svg-name' // 设置该路由的图标，对应路径src/icons/svg + icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示 } */ From 70ab18052c70db19dead4961c9f18544c8c9db61 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 10 Sep 2020 16:56:33 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E6=A0=B7=E5=BC=8F=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/components/Editor/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index b4173d3f..f81c0633 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -58,7 +58,7 @@ "sortablejs": "1.8.4", "vue": "2.6.10", "vue-count-to": "1.0.13", - "vue-quill-editor": "3.0.6", + "quill": "1.3.7", "vue-cropper": "0.4.9", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue index 162d240b..90549953 100644 --- a/ruoyi-ui/src/components/Editor/index.vue +++ b/ruoyi-ui/src/components/Editor/index.vue @@ -114,7 +114,7 @@ export default {