admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into satoken

Browse Source 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
This commit is contained in:
疯狂的狮子li 2021-09-27 17:27:32 +08:00
commit b082da73a1
25 changed files with 100 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -6,8 +6,9 @@
<br>
[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.1.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]()
[![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 `分布式集群` 场景升级(不兼容原框架)

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -289,7 +289,7 @@ thread-pool:
# 线程池维护线程所允许的空闲时间
keepAliveSeconds: 300
# 线程池对拒绝任务(无线程可用)的处理策略
# CALLER_RUNS_POLICY 等待
# CALLER_RUNS_POLICY 调用方执行
# DISCARD_OLDEST_POLICY 放弃最旧的
# DISCARD_POLICY 丢弃
# ABORT_POLICY 中止

2
ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java
View File

@ -15,7 +15,7 @@ import java.util.concurrent.ThreadPoolExecutor;
@AllArgsConstructor
public enum ThreadPoolRejectedPolicy {
CALLER_RUNS_POLICY("等待", ThreadPoolExecutor.CallerRunsPolicy.class),
CALLER_RUNS_POLICY("调用方执行", ThreadPoolExecutor.CallerRunsPolicy.class),
DISCARD_OLDEST_POLICY("放弃最旧的", ThreadPoolExecutor.DiscardOldestPolicy.class),
DISCARD_POLICY("丢弃", ThreadPoolExecutor.DiscardPolicy.class),
ABORT_POLICY("中止", ThreadPoolExecutor.AbortPolicy.class);

1
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
View File

@ -35,6 +35,7 @@ public class FileUtils extends FileUtil
.append(percentEncodedFileName);
response.setHeader("Content-disposition", contentDispositionValue.toString());
response.setHeader("download-filename", percentEncodedFileName);
}
/**

2
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -573,7 +573,7 @@ export default {
#end
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/${moduleName}/${businessName}/export', this.queryParams);
this.#[[$download]]#.excel('/${moduleName}/${businessName}/export', this.queryParams);
}
}
};

4
ruoyi-ui/package.json
View File

@ -42,7 +42,7 @@
"core-js": "3.8.1",
"echarts": "4.9.0",
"element-ui": "2.15.5",
"file-saver": "2.0.4",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
"js-beautify": "1.13.0",
@ -71,7 +71,7 @@
"eslint-plugin-vue": "7.2.0",
"lint-staged": "10.5.3",
"runjs": "4.4.2",
"sass": "1.32.0",
"sass": "1.42.1",
"sass-loader": "10.1.0",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",

2
ruoyi-ui/src/main.js
View File

@ -17,7 +17,6 @@ import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { downLoadExcel } from "@/utils/download";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
// 分页组件
import Pagination from "@/components/Pagination";
@ -44,7 +43,6 @@ Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.downLoadExcel = downLoadExcel
Vue.prototype.handleTree = handleTree
// 全局组件挂载

71
ruoyi-ui/src/plugins/download.js Normal file
View File

@ -0,0 +1,71 @@
import { saveAs } from 'file-saver'
import axios from 'axios'
import { getToken } from '@/utils/auth'
const baseURL = process.env.VUE_APP_BASE_API
export default {
excel(url, params) {
// get请求映射params参数
if (params) {
let urlparams = url + '?';
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
if (value !== null && typeof(value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
let subPart = encodeURIComponent(params) + '=';
urlparams += subPart + encodeURIComponent(value[key]) + '&';
}
}
} else {
urlparams += part + encodeURIComponent(value) + "&";
}
}
}
urlparams = urlparams.slice(0, -1);
url = urlparams;
}
url = baseURL + url
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
this.saveAs(blob, decodeURI(res.headers['download-filename']))
})
},
oss(ossId, name) {
var url = baseURL + '/system/oss/download/' + ossId
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
const blob = new Blob([res.data], { type: 'application/octet-stream' })
this.saveAs(blob, name)
})
},
zip(url, name) {
var url = baseURL + url
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name)
})
},
saveAs(text, name, opts) {
saveAs(text, name, opts);
}
}

3
ruoyi-ui/src/plugins/index.js
View File

@ -1,5 +1,6 @@
import cache from './cache'
import modal from './modal'
import download from './download'
export default {
install(Vue) {
@ -7,5 +8,7 @@ export default {
Vue.prototype.$cache = cache
// 模态框对象
Vue.prototype.$modal = modal
// 下载文件
Vue.prototype.$download = download
}
}

91
ruoyi-ui/src/utils/download.js
View File

@ -1,91 +0,0 @@
import axios from 'axios'
import { getToken } from '@/utils/auth'
const mimeMap = {
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
zip: 'application/zip',
oss: 'application/octet-stream'
}
const baseUrl = process.env.VUE_APP_BASE_API
export function downLoadZip(str, filename) {
var url = baseUrl + str
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
resolveBlob(res, mimeMap.zip)
})
}
export function downLoadOss(ossId) {
var url = baseUrl + '/system/oss/download/' + ossId
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
resolveBlob(res, mimeMap.oss)
})
}
export function downLoadExcel(url, params) {
// get请求映射params参数
if (params) {
let urlparams = url + '?';
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
if (value !== null && typeof(value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
let subPart = encodeURIComponent(params) + '=';
urlparams += subPart + encodeURIComponent(value[key]) + '&';
}
}
} else {
urlparams += part + encodeURIComponent(value) + "&";
}
}
}
urlparams = urlparams.slice(0, -1);
url = urlparams;
}
url = baseUrl + url
axios({
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(res => {
resolveBlob(res, mimeMap.xlsx)
})
}
/**
* 解析blob响应内容并下载
* @param {*} res blob响应内容
* @param {String} mimeType MIME类型
*/
export function resolveBlob(res, mimeType) {
const aLink = document.createElement('a')
var blob = new Blob([res.data], { type: mimeType })
// //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
var contentDisposition = decodeURI(res.headers['content-disposition'])
var result = patt.exec(contentDisposition)
var fileName = result[1]
fileName = fileName.replace(/\"/g, '')
aLink.style.display = 'none'
aLink.href = URL.createObjectURL(blob)
aLink.setAttribute('download', decodeURI(fileName)) // 设置下载文件名称
document.body.appendChild(aLink)
aLink.click()
URL.revokeObjectURL(aLink.href);//清除引用
document.body.removeChild(aLink);
}

2
ruoyi-ui/src/utils/ruoyi.js
View File

@ -3,8 +3,6 @@
* Copyright (c) 2019 ruoyi
*/
const baseURL = process.env.VUE_APP_BASE_API
// 日期格式化
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {

2
ruoyi-ui/src/views/demo/demo/index.vue
View File

@ -358,7 +358,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/demo/demo/export', this.queryParams);
this.$download.excel('/demo/demo/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -510,7 +510,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/monitor/job/export', this.queryParams);
this.$download.excel('/monitor/job/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -293,7 +293,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/monitor/jobLog/export', this.queryParams);
this.$download.excel('/monitor/jobLog/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@ -216,7 +216,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/monitor/logininfor/export', this.queryParams);
this.$download.excel('/monitor/logininfor/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@ -303,7 +303,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/monitor/operlog/export', this.queryParams);
this.$download.excel('/monitor/operlog/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/system/config/index.vue
View File

@ -334,7 +334,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/config/export', this.queryParams);
this.$download.excel('/system/config/export', this.queryParams);
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

2
ruoyi-ui/src/views/system/dict/data.vue
View File

@ -380,7 +380,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/dict/data/export', this.queryParams);
this.$download.excel('/system/dict/data/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/system/dict/index.vue
View File

@ -338,7 +338,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/dict/type/export', this.queryParams);
this.$download.excel('/system/dict/type/export', this.queryParams);
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

3
ruoyi-ui/src/views/system/oss/index.vue
View File

@ -188,7 +188,6 @@
<script>
import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
import { downLoadOss } from "@/utils/download";
export default {
name: "Oss",
@ -325,7 +324,7 @@ export default {
},
/** 下载按钮操作 */
handleDownload(row) {
downLoadOss(row.ossId)
this.$download.oss(row.ossId)
},
/** 删除按钮操作 */
handleDelete(row) {

2
ruoyi-ui/src/views/system/post/index.vue
View File

@ -305,7 +305,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/post/export', this.queryParams);
this.$download.excel('/system/post/export', this.queryParams);
}
}
};

2
ruoyi-ui/src/views/system/role/index.vue
View File

@ -613,7 +613,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/role/export', this.queryParams);
this.$download.excel('/system/role/export', this.queryParams);
}
}
};

4
ruoyi-ui/src/views/system/user/index.vue
View File

@ -643,7 +643,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.downLoadExcel('/system/user/export', this.queryParams);
this.$download.excel('/system/user/export', this.queryParams);
},
/** 导入按钮操作 */
handleImport() {
@ -652,7 +652,7 @@ export default {
},
/** 下载模板操作 */
importTemplate() {
this.downLoadExcel('/system/user/importTemplate');
this.$download.excel('/system/user/importTemplate');
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {

19
ruoyi-ui/src/views/tool/build/index.vue
View File

@ -137,23 +137,13 @@
<script>
import draggable from 'vuedraggable'
import { saveAs } from 'file-saver'
import beautifier from 'js-beautify'
import ClipboardJS from 'clipboard'
import render from '@/utils/generator/render'
import RightPanel from './RightPanel'
import {
inputComponents,
selectComponents,
layoutComponents,
formConf
} from '@/utils/generator/config'
import {
exportDefault, beautifierConf, isNumberStr, titleCase
} from '@/utils/index'
import {
makeUpHtml, vueTemplate, vueScript, cssStyle
} from '@/utils/generator/html'
import { inputComponents, selectComponents, layoutComponents, formConf } from '@/utils/generator/config'
import { beautifierConf, titleCase } from '@/utils/index'
import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css'
import drawingDefalut from '@/utils/generator/drawingDefalut'
@ -161,7 +151,6 @@ import logo from '@/assets/logo/logo.png'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
const emptyActiveData = { style: {}, autosize: {} }
let oldActiveId
let tempActiveData
@ -287,7 +276,7 @@ export default {
execDownload(data) {
const codeStr = this.generateCode()
const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
saveAs(blob, data.fileName)
this.$download.saveAs(blob, data.fileName)
},
execCopy(data) {
document.getElementById('copyNode').click()

3
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -180,7 +180,6 @@
<script>
import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
import importTable from "./importTable";
import { downLoadZip } from "@/utils/download";
import hljs from "highlight.js/lib/highlight";
import "highlight.js/styles/github-gist.css";
hljs.registerLanguage("java", require("highlight.js/lib/languages/java"));
@ -270,7 +269,7 @@ export default {
this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
});
} else {
downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
}
},
/** 同步数据库操作 */