From 7e476b941e2729bf65439e4d67483a3886f69481 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 14 十二月 2020 09:27:27 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-framework/pom.xml | 2
ruoyi-ui/src/views/tool/gen/index.vue | 11 +++--
ruoyi-admin/pom.xml | 2
ruoyi-system/pom.xml | 2
ruoyi-ui/src/views/index.vue | 60 +++++++++++++++++++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java | 13 +++++-
ruoyi-generator/pom.xml | 2
pom.xml | 4 +-
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-common/pom.xml | 2
ruoyi-quartz/pom.xml | 2
ruoyi-ui/package.json | 3 +
ruoyi-ui/src/main.js | 6 ++
13 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index b9d170b..d8411e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>3.2.1</version>
+ <version>3.3.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>鑻ヤ緷绠＄悊绯荤粺</description>
<properties>
- <ruoyi.version>3.2.1</ruoyi.version>
+ <ruoyi.version>3.3.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>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3257d8c..febca04 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.2.1</version>
+ <version>3.3.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 31b95c6..8c4b983 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
# 鍚嶇О
name: RuoYi
# 鐗堟湰
- version: 3.2.1
+ version: 3.3.0
# 鐗堟潈骞翠唤
copyrightYear: 2020
# 瀹炰緥婕旂ず寮�鍏�
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 35adaa3..8d4f57b 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.2.1</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
index ed91f2e..22a610d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
@@ -1,11 +1,13 @@
package com.ruoyi.common.core.redis;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundSetOperations;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -136,10 +138,15 @@
* @param dataSet 缂撳瓨鐨勬暟鎹�
* @return 缂撳瓨鏁版嵁鐨勫璞�
*/
- public <T> long setCacheSet(final String key, final Set<T> dataSet)
+ public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
{
- Long count = redisTemplate.opsForSet().add(key, dataSet);
- return count == null ? 0 : count;
+ BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+ Iterator<T> it = dataSet.iterator();
+ while (it.hasNext())
+ {
+ setOperation.add(it.next());
+ }
+ return setOperation;
}
/**
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 9be2f34..969197a 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.2.1</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 58abab1..8a768f2 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.2.1</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 15a5bc2..a6068a6 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.2.1</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index ef2cd72..cddc6a3 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.2.1</version>
+ <version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 14b1df8..cb10a63 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "3.2.1",
+ "version": "3.3.0",
"description": "鑻ヤ緷绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
@@ -44,6 +44,7 @@
"element-ui": "2.14.1",
"file-saver": "2.0.4",
"fuse.js": "6.4.3",
+ "highlight.js": "10.4.1",
"js-beautify": "1.13.0",
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 71bab79..678431f 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -18,8 +18,11 @@
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
-//鑷畾涔夎〃鏍煎伐鍏锋墿灞�
+// 鑷畾涔夎〃鏍煎伐鍏锋墿灞�
import RightToolbar from "@/components/RightToolbar"
+// 浠ｇ爜楂樹寒鎻掍欢
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github-gist.css'
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
@@ -49,6 +52,7 @@
Vue.component('RightToolbar', RightToolbar)
Vue.use(permission)
+Vue.use(hljs.vuePlugin);
/**
* If you don't want to use mock-server
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 55f3439..91667f5 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,64 @@
<span>鏇存柊鏃ュ織</span>
</div>
<el-collapse accordion>
+ <el-collapse-item title="v3.3.0 - 2020-12-14">
+ <ol>
+ <li>鏂板缂撳瓨鐩戞帶鍔熻兘</li>
+ <li>鏀寔涓婚椋庢牸閰嶇疆</li>
+ <li>淇澶氱骇鑿滃崟涔嬮棿鍒囨崲鏃犳硶缂撳瓨鐨勯棶棰�</li>
+ <li>澶氱骇鑿滃崟鑷姩閰嶇疆缁勪欢</li>
+ <li>浠ｇ爜鐢熸垚棰勮鏀寔楂樹寒鏄剧ず</li>
+ <li>鏀寔Get璇锋眰鏄犲皠Params鍙傛暟</li>
+ <li>鍒犻櫎鐢ㄦ埛鍜岃鑹茶В缁戝叧鑱�</li>
+ <li>鍘婚櫎鐢ㄦ埛鎵嬫満閭閮ㄩ棬蹇呭～楠岃瘉</li>
+ <li>Excel鏀寔娉ㄨВalign瀵归綈鏂瑰紡</li>
+ <li>Excel鏀寔瀵煎叆Boolean鍨嬫暟鎹�</li>
+ <li>浼樺寲澶村儚鏍峰紡锛岄紶鏍囩Щ鍏ユ偓鍋滈伄缃�</li>
+ <li>浠ｇ爜鐢熸垚棰勮鎻愪緵婊氬姩鏈哄埗</li>
+ <li>浠ｇ爜鐢熸垚鍒犻櫎澶氫綑鐨勬暟瀛梖loat绫诲瀷</li>
+ <li>淇杞崲瀛楃涓茬殑鐩爣瀛楃闆嗗睘鎬�</li>
+ <li>鍥炴樉鏁版嵁瀛楀吀闃叉绌哄�兼姤閿�</li>
+ <li>鏃ュ織璁板綍澧炲姞杩囨护澶氭枃浠跺満鏅�</li>
+ <li>淇敼缂撳瓨Set鏂规硶鍙兘瀵艰嚧宓屽鐨勯棶棰�</li>
+ <li>绉婚櫎鍓嶇涓�浜涘浣欑殑渚濊禆</li>
+ <li>闃叉瀹夊叏鎵弿YUI鍑虹幇鐨勯闄╂彁绀�</li>
+ <li>淇敼node-sass涓篸art-sass</li>
+ <li>鍗囩骇SpringBoot鍒版渶鏂扮増鏈�2.1.18</li>
+ <li>鍗囩骇poi鍒版渶鏂扮増鏈�4.1.2</li>
+ <li>鍗囩骇oshi鍒版渶鏂扮増鏈瑅5.3.6</li>
+ <li>鍗囩骇bitwalker鍒版渶鏂扮増鏈�1.21</li>
+ <li>鍗囩骇axios鍒版渶鏂扮増鏈�0.21.0</li>
+ <li>鍗囩骇element-ui鍒版渶鏂扮増鏈�2.14.1</li>
+ <li>鍗囩骇vue鍒版渶鏂扮増鏈�2.6.12</li>
+ <li>鍗囩骇vuex鍒版渶鏂扮増鏈�3.6.0</li>
+ <li>鍗囩骇vue-cli鍒扮増鏈�4.5.9</li>
+ <li>鍗囩骇vue-router鍒版渶鏂扮増鏈�3.4.9</li>
+ <li>鍗囩骇vue-cli鍒版渶鏂扮増鏈�4.4.6</li>
+ <li>鍗囩骇vue-cropper鍒版渶鏂扮増鏈�0.5.5</li>
+ <li>鍗囩骇clipboard鍒版渶鏂扮増鏈�2.0.6</li>
+ <li>鍗囩骇core-js鍒版渶鏂扮増鏈�3.8.1</li>
+ <li>鍗囩骇echarts鍒版渶鏂扮増鏈�4.9.0</li>
+ <li>鍗囩骇file-saver鍒版渶鏂扮増鏈�2.0.4</li>
+ <li>鍗囩骇fuse.js鍒版渶鏂扮増鏈�6.4.3</li>
+ <li>鍗囩骇js-beautify鍒版渶鏂扮増鏈�1.13.0</li>
+ <li>鍗囩骇js-cookie鍒版渶鏂扮増鏈�2.2.1</li>
+ <li>鍗囩骇path-to-regexp鍒版渶鏂扮増鏈�6.2.0</li>
+ <li>鍗囩骇quill鍒版渶鏂扮増鏈�1.3.7</li>
+ <li>鍗囩骇screenfull鍒版渶鏂扮増鏈�5.0.2</li>
+ <li>鍗囩骇sortablejs鍒版渶鏂扮増鏈�1.10.2</li>
+ <li>鍗囩骇vuedraggable鍒版渶鏂扮増鏈�2.24.3</li>
+ <li>鍗囩骇chalk鍒版渶鏂扮増鏈�4.1.0</li>
+ <li>鍗囩骇eslint鍒版渶鏂扮増鏈�7.15.0</li>
+ <li>鍗囩骇eslint-plugin-vue鍒版渶鏂扮増鏈�7.2.0</li>
+ <li>鍗囩骇lint-staged鍒版渶鏂扮増鏈�10.5.3</li>
+ <li>鍗囩骇runjs鍒版渶鏂扮増鏈�4.4.2</li>
+ <li>鍗囩骇sass-loader鍒版渶鏂扮増鏈�10.1.0</li>
+ <li>鍗囩骇script-ext-html-webpack-plugin鍒版渶鏂扮増鏈�2.1.5</li>
+ <li>鍗囩骇svg-sprite-loader鍒版渶鏂扮増鏈�5.1.1</li>
+ <li>鍗囩骇vue-template-compiler鍒版渶鏂扮増鏈�2.6.12</li>
+ <li>鍏朵粬缁嗚妭浼樺寲</li>
+ </ol>
+ </el-collapse-item>
<el-collapse-item title="v3.2.1 - 2020-11-18">
<ol>
<li>闃绘浠绘剰鏂囦欢涓嬭浇婕忔礊</li>
@@ -435,7 +493,7 @@
data() {
return {
// 鐗堟湰鍙�
- version: "3.2.1",
+ version: "3.3.0",
};
},
methods: {
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 828bb1f..a5792bf 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -91,21 +91,21 @@
align="center"
prop="tableName"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column
label="琛ㄦ弿杩�"
align="center"
prop="tableComment"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column
label="瀹炰綋"
align="center"
prop="className"
:show-overflow-tooltip="true"
- width="130"
+ width="120"
/>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" />
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" />
@@ -159,13 +159,13 @@
<!-- 棰勮鐣岄潰 -->
<el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
<el-tabs v-model="preview.activeName">
- <el-tab-pane style="overflow-x: scroll;"
+ <el-tab-pane
v-for="(value, key) in preview.data"
:label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:key="key"
>
- <pre>{{ value }}</pre>
+ <highlightjs autodetect :code="value" />
</el-tab-pane>
</el-tabs>
</el-dialog>
@@ -177,6 +177,7 @@
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import importTable from "./importTable";
import { downLoadZip } from "@/utils/zipdownload";
+
export default {
name: "Gen",
components: { importTable },
--
Gitblit v1.9.3