From 4088463adf5a33a43b7fddf3f66d65c220acf93d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 16 Jul 2020 16:54:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1cron?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/monitor/controller/SysJobController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java index 9894cd8d..742d281c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.exception.job.TaskException; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.job.CronUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; @@ -77,6 +79,11 @@ public class SysJobController extends BaseController @PostMapping public AjaxResult add(@RequestBody SysJob sysJob) throws SchedulerException, TaskException { + if (!CronUtils.isValid(sysJob.getCronExpression())) + { + return AjaxResult.error("cron表达式不正确"); + } + sysJob.setCreateBy(SecurityUtils.getUsername()); return toAjax(jobService.insertJob(sysJob)); } @@ -88,6 +95,11 @@ public class SysJobController extends BaseController @PutMapping public AjaxResult edit(@RequestBody SysJob sysJob) throws SchedulerException, TaskException { + if (!CronUtils.isValid(sysJob.getCronExpression())) + { + return AjaxResult.error("cron表达式不正确"); + } + sysJob.setUpdateBy(SecurityUtils.getUsername()); return toAjax(jobService.updateJob(sysJob)); } From 2211a75704860d9e6ae9dd02602746b14ad1e67f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Jul 2020 09:24:04 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E4=B8=BAuuid=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/utils/file/FileUploadUtils.java | 16 ++-------------- .../utils/{security => sign}/Md5Utils.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 1 - 3 files changed, 3 insertions(+), 16 deletions(-) rename ruoyi/src/main/java/com/ruoyi/common/utils/{security => sign}/Md5Utils.java (93%) diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index 6921fea7..5b356e29 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -9,8 +9,8 @@ import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; import com.ruoyi.common.exception.file.FileSizeLimitExceededException; import com.ruoyi.common.exception.file.InvalidExtensionException; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.IdUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.security.Md5Utils; import com.ruoyi.framework.config.RuoYiConfig; /** @@ -35,8 +35,6 @@ public class FileUploadUtils */ private static String defaultBaseDir = RuoYiConfig.getProfile(); - private static int counter = 0; - public static void setDefaultBaseDir(String defaultBaseDir) { FileUploadUtils.defaultBaseDir = defaultBaseDir; @@ -125,7 +123,7 @@ public class FileUploadUtils { String fileName = file.getOriginalFilename(); String extension = getExtension(file); - fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension; + fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; return fileName; } @@ -152,16 +150,6 @@ public class FileUploadUtils return pathFileName; } - /** - * 编码文件名 - */ - private static final String encodingFilename(String fileName) - { - fileName = fileName.replace("_", " "); - fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++); - return fileName; - } - /** * 文件大小校验 * diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java similarity index 93% rename from ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java rename to ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java index 40e80304..df1e23f8 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/security/Md5Utils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.security; +package com.ruoyi.common.utils.sign; import java.security.MessageDigest; import org.slf4j.Logger; diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java index 28788e4d..b6842e9c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java @@ -454,5 +454,4 @@ public class SysUserServiceImpl implements ISysUserService } return successMsg.toString(); } - } From aad58640dcaab7bed4f9720b57bb7f0cc2c4e343 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 17 Jul 2020 11:10:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=BF=BB=E8=BD=AC""=E4=B8=BAequals?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=EF=BC=8C=E9=98=B2=E6=AD=A2=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index 5e92cde8..20037432 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -204,7 +204,7 @@ public class HttpUtils String ret = ""; while ((ret = br.readLine()) != null) { - if (ret != null && !ret.trim().equals("")) + if (ret != null && !"".equals(ret.trim())) { result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); } From 22b09535afd36b76564a6b32a6fd6c7d967d1db4 Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 17 Jul 2020 11:11:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dparam=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/framework/security/service/SysLoginService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java index 4f99044e..67b6b494 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java @@ -40,7 +40,7 @@ public class SysLoginService * * @param username 用户名 * @param password 密码 - * @param captcha 验证码 + * @param code 验证码 * @param uuid 唯一标识 * @return 结果 */ From 086b9cdc23e353f8b56e2586e5a32d3c68ec9a69 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Jul 2020 15:19:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BB=E7=B1=BB=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/menu/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index 1e36780b..2303a52e 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -314,8 +314,10 @@ export default { handleAdd(row) { this.reset(); this.getTreeselect(); - if (row != null) { + if (row != null && row.menuId) { this.form.parentId = row.menuId; + } else { + this.form.parentId = 0; } this.open = true; this.title = "添加菜单"; From d29fe10b9346aec0bb1aff1ebf1fe9fa9c41d45f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Jul 2020 16:20:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4babel=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E7=BC=96=E8=AF=91=E9=80=9F=E5=BA=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 3 --- .../ruoyi/project/system/controller/SysLoginController.java | 2 +- .../src/main/java/com/ruoyi/project/system/domain/SysUser.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index b41c859e..6353e1b4 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -65,9 +65,6 @@ "vuex": "3.1.0" }, "devDependencies": { - "@babel/core": "7.0.0", - "@babel/register": "7.0.0", - "@babel/parser": "^7.7.4", "@vue/cli-plugin-babel": "3.5.3", "@vue/cli-plugin-eslint": "^3.9.1", "@vue/cli-plugin-unit-jest": "3.5.3", diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java index df823178..73aaa71c 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java @@ -42,7 +42,7 @@ public class SysLoginController /** * 登录方法 * - * @param loginBody 登陆信息 + * @param loginBody 登录信息 * @return 结果 */ @PostMapping("/login") diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java index 88a80c3a..2e491ad5 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java @@ -297,7 +297,7 @@ public class SysUser extends BaseEntity { this.postIds = postIds; } - + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)