From bd39b971cf9fbecdc3086f4ef75a37291b98505d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 10 十月 2020 09:19:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-quartz/pom.xml | 2 +-
ruoyi-framework/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-admin/pom.xml | 2 +-
ruoyi-system/pom.xml | 2 +-
ruoyi-ui/src/utils/ruoyi.js | 4 ++--
ruoyi-generator/pom.xml | 2 +-
pom.xml | 8 ++++----
ruoyi-admin/src/main/resources/application.yml | 4 ++--
ruoyi-common/pom.xml | 2 +-
ruoyi-ui/src/views/monitor/job/index.vue | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index f8ed7ed..76481d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,25 +6,25 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.1.0</ruoyi.version>
+ <ruoyi.version>3.2.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<mybatis.boot.version>1.3.2</mybatis.boot.version>
- <druid.version>1.1.22</druid.version>
+ <druid.version>1.2.1</druid.version>
<bitwalker.version>1.19</bitwalker.version>
<swagger.version>2.9.2</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
<pagehelper.boot.version>1.2.5</pagehelper.boot.version>
- <fastjson.version>1.2.73</fastjson.version>
+ <fastjson.version>1.2.74</fastjson.version>
<oshi.version>5.2.5</oshi.version>
<jna.version>5.5.0</jna.version>
<commons.io.version>2.5</commons.io.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2359bfe..da3aa62 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index aef4aa0..e43091e 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,9 +3,9 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.1.0
+ version: 3.2.0
# 鐗堟潈骞翠唤
- copyrightYear: 2019
+ copyrightYear: 2020
# 瀹炰緥婕旂ず寮�鍏�
demoEnabled: true
# 鏂囦欢璺緞,浣跨敤jvm绯荤粺鍙橀噺,鍏煎windows鍜宭inux;
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index cbe0f29..46823fe 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 190454a..e8f79c2 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index baaefe1..43d1245 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index bf6b9db..ae6abe8 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 123b8b3..95717f7 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index a71e194..c9cf69e 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.1.0",
+ "version": "3.2.0",
"description": "鑻ヤ緷绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index e7f4180..e8243f6 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -59,8 +59,8 @@
search.beginTime = "";
search.endTime = "";
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ search.beginTime = dateRange[0];
+ search.endTime = dateRange[1];
}
return search;
}
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 5ed6ed9..2b091e7 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -111,7 +111,7 @@
type="text"
icon="el-icon-caret-right"
@click="handleRun(scope.row)"
- v-hasPermi="['monitor:job:edit']"
+ v-hasPermi="['monitor:job:changeStatus']"
>鎵ц涓�娆�</el-button>
<el-button
size="mini"
--
Gitblit v1.9.3