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-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
   })
-}
+}