From a53a3b3119659d6ec28b458dcefd46f4ec49d55c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 七月 2020 16:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 1
ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java | 2
ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java | 2
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 2
ruoyi-ui/package.json | 3 -
ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 21 ++--------
ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 2
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 2
ruoyi-ui/src/views/system/menu/index.vue | 20 +++++----
ruoyi/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java | 12 ++++++
10 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index e4396f9..950de91 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-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index e9b8c9e..9fc2d78 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -49,16 +49,16 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="mini"
- type="text"
- icon="el-icon-edit"
+ <el-button size="mini"
+ type="text"
+ icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-plus"
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>鏂板</el-button>
@@ -314,8 +314,10 @@
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 = "娣诲姞鑿滃崟";
@@ -369,4 +371,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
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 f72cfde..1c0d9fb 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,13 +9,13 @@
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;
/**
* 鏂囦欢涓婁紶宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class FileUploadUtils
@@ -34,8 +34,6 @@
* 榛樿涓婁紶鐨勫湴鍧�
*/
private static String defaultBaseDir = RuoYiConfig.getProfile();
-
- private static int counter = 0;
public static void setDefaultBaseDir(String defaultBaseDir)
{
@@ -82,7 +80,6 @@
}
catch (Exception e)
{
- e.printStackTrace();
throw new IOException(e.getMessage(), e);
}
}
@@ -126,7 +123,7 @@
{
String fileName = file.getOriginalFilename();
String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + encodingFilename(fileName) + "." + extension;
+ fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
return fileName;
}
@@ -152,16 +149,6 @@
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
return pathFileName;
- }
-
- /**
- * 缂栫爜鏂囦欢鍚�
- */
- private static final String encodingFilename(String fileName)
- {
- fileName = fileName.replace("_", " ");
- fileName = Md5Utils.hash(fileName + System.nanoTime() + counter++);
- return fileName;
}
/**
@@ -229,7 +216,7 @@
/**
* 鑾峰彇鏂囦欢鍚嶇殑鍚庣紑
- *
+ *
* @param file 琛ㄥ崟鏂囦欢
* @return 鍚庣紑鍚�
*/
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 f7a96e1..9aee92e 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 @@
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"));
}
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 96%
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 2bb1a8b..de77ee8 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/framework/security/service/SysLoginService.java b/ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
index 3bb1155..c412ed0 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 @@
*
* @param username 鐢ㄦ埛鍚�
* @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮�
+ * @param code 楠岃瘉鐮�
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
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 9894cd8..742d281 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.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 @@
@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 @@
@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));
}
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 fae64fe..3759a48 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 @@
/**
* 鐧诲綍鏂规硶
*
- * @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 74cb754..7c63e01 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 @@
{
this.postIds = postIds;
}
-
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
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 39e5d63..e0327be 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 @@
}
return successMsg.toString();
}
-
}
--
Gitblit v1.9.3