Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-ui/src/api/login.js
| | |
|---|
| | | |
|---|
| | | // xss过滤 |
|---|
| | | json = HtmlUtil.cleanHtmlTag(json).trim(); |
|---|
| | | |
|---|
| | | final ByteArrayInputStream bis = IoUtil.toStream(json, StandardCharsets.UTF_8); |
|---|
| | | byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8); |
|---|
| | | final ByteArrayInputStream bis = IoUtil.toStream(jsonBytes); |
|---|
| | | return new ServletInputStream() |
|---|
| | | { |
|---|
| | | @Override |
|---|
| | |
|---|
| | | public boolean isReady() |
|---|
| | | { |
|---|
| | | return true; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public int available() throws IOException |
|---|
| | | { |
|---|
| | | return jsonBytes.length; |
|---|
| | | } |
|---|
| | | |
|---|
| | | @Override |
|---|
| | |
|---|
| | | String header = super.getHeader(HttpHeaders.CONTENT_TYPE); |
|---|
| | | return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | export function getCodeImg() { |
|---|
| | | return request({ |
|---|
| | | url: '/captchaImage', |
|---|
| | | method: 'get' |
|---|
| | | method: 'get', |
|---|
| | | timeout: 20000 |
|---|
| | | }) |
|---|
| | | } |
|---|
| | | } |
|---|
| | |
|---|
| | | type: Array,
|
|---|
| | | default: null,
|
|---|
| | | },
|
|---|
| | | value: [String, Array],
|
|---|
| | | value: [Number, String, Array],
|
|---|
| | | },
|
|---|
| | | computed: {
|
|---|
| | | values() {
|
|---|
| | | if (this.value) {
|
|---|
| | | return Array.isArray(this.value) ? this.value : [this.value];
|
|---|
| | | if (this.value !== null && typeof this.value !== 'undefined') {
|
|---|
| | | return Array.isArray(this.value) ? this.value : [String(this.value)];
|
|---|
| | | } else {
|
|---|
| | | return [];
|
|---|
| | | }
|
|---|
| | |
|---|
| | | if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { |
|---|
| | | time = parseInt(time) |
|---|
| | | } else if (typeof time === 'string') { |
|---|
| | | time = time.replace(new RegExp(/-/gm), '/'); |
|---|
| | | time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),''); |
|---|
| | | } |
|---|
| | | if ((typeof time === 'number') && (time.toString().length === 10)) { |
|---|
| | | time = time * 1000 |
|---|
