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

ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java

@@ -65,8 +65,8 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
 
         // 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
@@ -81,6 +81,12 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
                 return true;
             }
 
+            @Override
+            public int available() throws IOException
+            {
+                return jsonBytes.length;
+            }
+
             @Override
             public void setReadListener(ReadListener readListener)
             {
@@ -104,4 +110,4 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
         String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
         return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
     }
-}
+}

ruoyi-ui/src/api/login.js

@@ -47,6 +47,7 @@ export function logout() {
 export function getCodeImg() {
   return request({
     url: '/captchaImage',
-    method: 'get'
+    method: 'get',
+	timeout: 20000
   })
-}
+}

ruoyi-ui/src/components/DictTag/index.vue

@@ -31,12 +31,12 @@ export default {
       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 [];
       }

ruoyi-ui/src/utils/ruoyi.js

@@ -18,7 +18,7 @@ export function parseTime(time, pattern) {
 		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