Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:

	.gitignore

	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

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

	ruoyi-ui/src/views/tool/build/index.vue

ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java

@@ -181,6 +181,11 @@ public interface GenConstants {
      */
     String QUERY_LIKE = "LIKE";
 
+    /**
+     * 相等查询
+     */
+    String QUERY_EQ = "EQ";
+
     /**
      * 需要
      */

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -44,6 +44,6 @@ public class LoginBody {
      * 唯一标识
      */
     @ApiModelProperty(value = "唯一标识")
-    private String uuid = "";
+    private String uuid;
 
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java

@@ -97,9 +97,8 @@ public class ServletUtils extends ServletUtil {
      *
      * @param response 渲染对象
      * @param string   待渲染的字符串
-     * @return null
      */
-    public static String renderString(HttpServletResponse response, String string) {
+    public static void renderString(HttpServletResponse response, String string) {
         try {
             response.setStatus(HttpStatus.HTTP_OK);
             response.setContentType(MediaType.APPLICATION_JSON_VALUE);
@@ -108,7 +107,6 @@ public class ServletUtils extends ServletUtil {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return null;
     }
 
     /**
@@ -119,12 +117,12 @@ public class ServletUtils extends ServletUtil {
     public static boolean isAjaxRequest(HttpServletRequest request) {
 
         String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1) {
+        if (accept != null && accept.contains("application/json")) {
             return true;
         }
 
         String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
             return true;
         }
 
@@ -134,10 +132,7 @@ public class ServletUtils extends ServletUtil {
         }
 
         String ajax = request.getParameter("__ajax");
-        if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
-            return true;
-        }
-        return false;
+        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
     }
 
     public static String getClientIP() {

ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

@@ -56,6 +56,6 @@ public class AddressUtils {
                 log.error("获取地理位置异常 {}", ip);
             }
         }
-        return address;
+        return UNKNOWN;
     }
 }