!426 修正单词拼写错误

Merge pull request !426 from 稚屿/master

@@ -41,8 +41,7 @@ public class DictUtils
         Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
         Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
         if (StringUtils.isNotNull(cacheObj))
         if (StringUtils.isNotNull(cacheObj))
         {
         {
-            List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
-            return dictDatas;
+            return StringUtils.cast(cacheObj);
         }
         }
         return null;
         return null;
     }
     }

@@ -18,8 +18,7 @@ public class ExceptionUtil
     {
     {
         StringWriter sw = new StringWriter();
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw, true));
         e.printStackTrace(new PrintWriter(sw, true));
-        String str = sw.toString();
-        return str;
+        return sw.toString();
     }
     }
 
 
     public static String getRootErrorMessage(Exception e)
     public static String getRootErrorMessage(Exception e)

@@ -99,9 +99,8 @@ public class ServletUtils
      * 
      * 
      * @param response 渲染对象
      * @param response 渲染对象
      * @param string 待渲染的字符串
      * @param string 待渲染的字符串
-     * @return null
      */
      */
-    public static String renderString(HttpServletResponse response, String string)
+    public static void renderString(HttpServletResponse response, String string)
     {
     {
         try
         try
         {
         {
@@ -114,7 +113,6 @@ public class ServletUtils
         {
         {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        return null;
     }
     }
 
 
     /**
     /**
@@ -125,13 +123,13 @@ public class ServletUtils
     public static boolean isAjaxRequest(HttpServletRequest request)
     public static boolean isAjaxRequest(HttpServletRequest request)
     {
     {
         String accept = request.getHeader("accept");
         String accept = request.getHeader("accept");
-        if (accept != null && accept.indexOf("application/json") != -1)
+        if (accept != null && accept.contains("application/json"))
         {
         {
             return true;
             return true;
         }
         }
 
 
         String xRequestedWith = request.getHeader("X-Requested-With");
         String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1)
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
         {
         {
             return true;
             return true;
         }
         }
@@ -143,10 +141,6 @@ public class ServletUtils
         }
         }
 
 
         String ajax = request.getParameter("__ajax");
         String ajax = request.getParameter("__ajax");
-        if (StringUtils.inStringIgnoreCase(ajax, "json", "xml"))
-        {
-            return true;
-        }
-        return false;
+        return StringUtils.inStringIgnoreCase(ajax, "json", "xml");
     }
     }
 }
 }

@@ -208,7 +208,6 @@ public class VerifyCodeUtils
 
 
         int period = random.nextInt(40) + 10; // 50;
         int period = random.nextInt(40) + 10; // 50;
 
 
-        boolean borderGap = true;
         int frames = 20;
         int frames = 20;
         int phase = 7;
         int phase = 7;
         for (int i = 0; i < w1; i++)
         for (int i = 0; i < w1; i++)
@@ -216,13 +215,9 @@ public class VerifyCodeUtils
             double d = (double) (period >> 1)
             double d = (double) (period >> 1)
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
                     * Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
             g.copyArea(i, 0, 1, h1, 0, (int) d);
             g.copyArea(i, 0, 1, h1, 0, (int) d);
-            if (borderGap)
-            {
             g.setColor(color);
             g.setColor(color);
             g.drawLine(i, (int) d, i, 0);
             g.drawLine(i, (int) d, i, 0);
             g.drawLine(i, (int) d + h1, i, h1);
             g.drawLine(i, (int) d + h1, i, h1);
         }
         }
-
-        }
     }
     }
 }
 }

@@ -2,6 +2,8 @@ package com.ruoyi.common.utils.file;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.Objects;
+
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.config.RuoYiConfig;
@@ -100,7 +102,7 @@ public class FileUploadUtils
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
             InvalidExtensionException
             InvalidExtensionException
     {
     {
-        int fileNamelength = file.getOriginalFilename().length();
+        int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
         if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
         if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
         {
         {
             throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
             throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
@@ -112,8 +114,7 @@ public class FileUploadUtils
 
 
         File desc = getAbsoluteFile(baseDir, fileName);
         File desc = getAbsoluteFile(baseDir, fileName);
         file.transferTo(desc);
         file.transferTo(desc);
-        String pathFileName = getPathFileName(baseDir, fileName);
-        return pathFileName;
+        return getPathFileName(baseDir, fileName);
     }
     }
 
 
     /**
     /**
@@ -145,8 +146,7 @@ public class FileUploadUtils
     {
     {
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
-        String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
-        return pathFileName;
+        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }
     }
 
 
     /**
     /**
@@ -161,7 +161,7 @@ public class FileUploadUtils
             throws FileSizeLimitExceededException, InvalidExtensionException
             throws FileSizeLimitExceededException, InvalidExtensionException
     {
     {
         long size = file.getSize();
         long size = file.getSize();
-        if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
+        if (size > DEFAULT_MAX_SIZE)
         {
         {
             throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
             throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
         }
         }
@@ -228,7 +228,7 @@ public class FileUploadUtils
         String extension = FilenameUtils.getExtension(file.getOriginalFilename());
         String extension = FilenameUtils.getExtension(file.getOriginalFilename());
         if (StringUtils.isEmpty(extension))
         if (StringUtils.isEmpty(extension))
         {
         {
-            extension = MimeTypeUtils.getExtension(file.getContentType());
+            extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
         }
         }
         return extension;
         return extension;
     }
     }

@@ -59,7 +59,7 @@ public class ImageUtils
     /**
     /**
      * 读取文件为字节数据
      * 读取文件为字节数据
      * 
      * 
-     * @param key 地址
+     * @param url 地址
      * @return 字节数据
      * @return 字节数据
      */
      */
     public static byte[] readFile(String url)
     public static byte[] readFile(String url)

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -25,7 +26,7 @@ public class HttpHelper
         BufferedReader reader = null;
         BufferedReader reader = null;
         try (InputStream inputStream = request.getInputStream())
         try (InputStream inputStream = request.getInputStream())
         {
         {
-            reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
+            reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
             String line = "";
             String line = "";
             while ((line = reader.readLine()) != null)
             while ((line = reader.readLine()) != null)
             {
             {

@@ -9,6 +9,7 @@ import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 import java.security.cert.X509Certificate;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.HttpsURLConnection;
@@ -130,9 +131,8 @@ public class HttpUtils
         StringBuilder result = new StringBuilder();
         StringBuilder result = new StringBuilder();
         try
         try
         {
         {
-            String urlNameString = url;
-            log.info("sendPost - {}", urlNameString);
-            URL realUrl = new URL(urlNameString);
+            log.info("sendPost - {}", url);
+            URL realUrl = new URL(url);
             URLConnection conn = realUrl.openConnection();
             URLConnection conn = realUrl.openConnection();
             conn.setRequestProperty("accept", "*/*");
             conn.setRequestProperty("accept", "*/*");
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("connection", "Keep-Alive");
@@ -144,7 +144,7 @@ public class HttpUtils
             out = new PrintWriter(conn.getOutputStream());
             out = new PrintWriter(conn.getOutputStream());
             out.print(param);
             out.print(param);
             out.flush();
             out.flush();
-            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
             String line;
             String line;
             while ((line = in.readLine()) != null)
             while ((line = in.readLine()) != null)
             {
             {
@@ -218,7 +218,7 @@ public class HttpUtils
             {
             {
                 if (ret != null && !"".equals(ret.trim()))
                 if (ret != null && !"".equals(ret.trim()))
                 {
                 {
-                    result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
+                    result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
                 }
                 }
             }
             }
             log.info("recv - {}", result);
             log.info("recv - {}", result);

@@ -25,7 +25,6 @@ public class AddressUtils
 
 
     public static String getRealAddressByIP(String ip)
     public static String getRealAddressByIP(String ip)
     {
     {
-        String address = UNKNOWN;
         // 内网不查询
         // 内网不查询
         if (IpUtils.internalIp(ip))
         if (IpUtils.internalIp(ip))
         {
         {
@@ -51,6 +50,6 @@ public class AddressUtils
                 log.error("获取地理位置异常 {}", ip);
                 log.error("获取地理位置异常 {}", ip);
             }
             }
         }
         }
-        return address;
+        return UNKNOWN;
     }
     }
 }
 }

@@ -1121,7 +1121,7 @@ public class ExcelUtil<T>
         if (StringUtils.isNotEmpty(excel.targetAttr()))
         if (StringUtils.isNotEmpty(excel.targetAttr()))
         {
         {
             String target = excel.targetAttr();
             String target = excel.targetAttr();
-            if (target.indexOf(".") > -1)
+            if (target.contains("."))
             {
             {
                 String[] targets = target.split("[.]");
                 String[] targets = target.split("[.]");
                 for (String name : targets)
                 for (String name : targets)
@@ -1216,7 +1216,7 @@ public class ExcelUtil<T>
         for (Object[] os : this.fields)
         for (Object[] os : this.fields)
         {
         {
             Excel excel = (Excel) os[1];
             Excel excel = (Excel) os[1];
-            maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+            maxHeight = Math.max(maxHeight, excel.height());
         }
         }
         return (short) (maxHeight * 20);
         return (short) (maxHeight * 20);
     }
     }

 package com.ruoyi.common.utils.sign;
 package com.ruoyi.common.utils.sign;
 
 
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.MessageDigest;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@ public class Md5Utils
     {
     {
         try
         try
         {
         {
-            return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
+            return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
         }
         }
         catch (Exception e)
         catch (Exception e)
         {
         {

@@ -50,10 +50,8 @@ public class SqlUtil
             return;
             return;
         }
         }
         String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
         String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
-        for (int i = 0; i < sqlKeywords.length; i++)
-        {
-            if (StringUtils.indexOfIgnoreCase(value, sqlKeywords[i]) > -1)
-            {
+        for (String sqlKeyword : sqlKeywords) {
+            if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) {
                 throw new UtilException("参数存在SQL注入风险");
                 throw new UtilException("参数存在SQL注入风险");
             }
             }
         }
         }

@@ -151,8 +151,7 @@ public class GenUtils
     {
     {
         int lastIndex = packageName.lastIndexOf(".");
         int lastIndex = packageName.lastIndexOf(".");
         int nameLength = packageName.length();
         int nameLength = packageName.length();
-        String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
-        return moduleName;
+        return StringUtils.substring(packageName, lastIndex + 1, nameLength);
     }
     }
 
 
     /**
     /**
@@ -165,8 +164,7 @@ public class GenUtils
     {
     {
         int lastIndex = tableName.lastIndexOf("_");
         int lastIndex = tableName.lastIndexOf("_");
         int nameLength = tableName.length();
         int nameLength = tableName.length();
-        String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
-        return businessName;
+        return StringUtils.substring(tableName, lastIndex + 1, nameLength);
     }
     }
 
 
     /**
     /**

@@ -228,8 +228,7 @@ public class VelocityUtils
     public static String getPackagePrefix(String packageName)
     public static String getPackagePrefix(String packageName)
     {
     {
         int lastIndex = packageName.lastIndexOf(".");
         int lastIndex = packageName.lastIndexOf(".");
-        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
-        return basePackage;
+        return StringUtils.substring(packageName, 0, lastIndex);
     }
     }
 
 
     /**
     /**

@@ -63,12 +63,9 @@ public class SysDeptServiceImpl implements ISysDeptService
         {
         {
             tempList.add(dept.getDeptId());
             tempList.add(dept.getDeptId());
         }
         }
-        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
-        {
-            SysDept dept = (SysDept) iterator.next();
+        for (SysDept dept : depts) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(dept.getParentId()))
-            {
+            if (!tempList.contains(dept.getParentId())) {
                 recursionFn(depts, dept);
                 recursionFn(depts, dept);
                 returnList.add(dept);
                 returnList.add(dept);
             }
             }

@@ -498,7 +498,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      */
      */
     private boolean hasChild(List<SysMenu> list, SysMenu t)
     private boolean hasChild(List<SysMenu> list, SysMenu t)
     {
     {
-        return getChildList(list, t).size() > 0 ? true : false;
+        return getChildList(list, t).size() > 0;
     }
     }
 
 
     /**
     /**

@@ -5,11 +5,11 @@ let confGlobal
 let someSpanIsNot24
 let someSpanIsNot24
 
 
 export function dialogWrapper(str) {
 export function dialogWrapper(str) {
-  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile">
+  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title">
     ${str}
     ${str}
     <div slot="footer">
     <div slot="footer">
       <el-button @click="close">取消</el-button>
       <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="handelConfirm">确定</el-button>
+      <el-button type="primary" @click="handleConfirm">确定</el-button>
     </div>
     </div>
   </el-dialog>`
   </el-dialog>`
 }
 }

@@ -98,7 +98,7 @@ function mixinMethod(type) {
         close: `close() {
         close: `close() {
         this.$emit('update:visible', false)
         this.$emit('update:visible', false)
       },`,
       },`,
-        handelConfirm: `handelConfirm() {
+        handleConfirm: `handleConfirm() {
         this.$refs['${confGlobal.formRef}'].validate(valid => {
         this.$refs['${confGlobal.formRef}'].validate(valid => {
           if(!valid) return
           if(!valid) return
           this.close()
           this.close()

@@ -41,7 +41,7 @@
         <el-button @click="close">
         <el-button @click="close">
           取消
           取消
         </el-button>
         </el-button>
-        <el-button type="primary" @click="handelConfirm">
+        <el-button type="primary" @click="handleConfirm">
           确定
           确定
         </el-button>
         </el-button>
       </div>
       </div>
@@ -94,7 +94,7 @@ export default {
     close(e) {
     close(e) {
       this.$emit('update:visible', false)
       this.$emit('update:visible', false)
     },
     },
-    handelConfirm() {
+    handleConfirm() {
       this.$refs.elForm.validate(valid => {
       this.$refs.elForm.validate(valid => {
         if (!valid) return
         if (!valid) return
         this.$emit('confirm', { ...this.formData })
         this.$emit('confirm', { ...this.formData })

@@ -59,7 +59,7 @@
       <div slot="footer">
       <div slot="footer">
         <el-button
         <el-button
           type="primary"
           type="primary"
-          @click="handelConfirm"
+          @click="handleConfirm"
         >
         >
           确定
           确定
         </el-button>
         </el-button>
@@ -133,7 +133,7 @@ export default {
     close() {
     close() {
       this.$emit('update:visible', false)
       this.$emit('update:visible', false)
     },
     },
-    handelConfirm() {
+    handleConfirm() {
       this.$refs.elForm.validate(valid => {
       this.$refs.elForm.validate(valid => {
         if (!valid) return
         if (!valid) return
         if (this.dataType === 'number') {
         if (this.dataType === 'number') {

@@ -146,7 +146,7 @@ import { beautifierConf, titleCase } from '@/utils/index'
 import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
 import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import { makeUpCss } from '@/utils/generator/css'
-import drawingDefalut from '@/utils/generator/drawingDefalut'
+import drawingDefault from '@/utils/generator/drawingDefault'
 import logo from '@/assets/logo/logo.png'
 import logo from '@/assets/logo/logo.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'
 import DraggableItem from './DraggableItem'
@@ -171,15 +171,15 @@ export default {
       selectComponents,
       selectComponents,
       layoutComponents,
       layoutComponents,
       labelWidth: 100,
       labelWidth: 100,
-      drawingList: drawingDefalut,
+      drawingList: drawingDefault,
       drawingData: {},
       drawingData: {},
-      activeId: drawingDefalut[0].formId,
+      activeId: drawingDefault[0].formId,
       drawerVisible: false,
       drawerVisible: false,
       formData: {},
       formData: {},
       dialogVisible: false,
       dialogVisible: false,
       generateConf: null,
       generateConf: null,
       showFileName: false,
       showFileName: false,
-      activeData: drawingDefalut[0]
+      activeData: drawingDefault[0]
     }
     }
   },
   },
   created() {
   created() {