!21 🐛 Object的equals方法容易抛空指针异常，应使用常量或确定有值的对象来调用equals。

Merge pull request !21 from 徐晓伟/master-equals

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/CrmebUtil.java

@@ -396,7 +396,7 @@ public class CrmebUtil {
         }
 
         ip = request.getRemoteAddr();
-        if(ip.equals("0:0:0:0:0:0:0:1")){
+        if("0:0:0:0:0:0:0:1".equals(ip)){
             //本地 localhost访问 ipv6
             ip = "127.0.0.1";
         }
@@ -419,11 +419,11 @@ public class CrmebUtil {
             return false;
         }
 
-        if(ip.equals("unKnown")){
+        if("unKnown".equals(ip)){
             return false;
         }
 
-        if(ip.equals("unknown")){
+        if("unknown".equals(ip)){
             return false;
         }
 

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ImageMergeUtil.java

@@ -73,7 +73,7 @@ public class ImageMergeUtil {
             File file = new File(fileName);
             BufferedImage read = ImageIO.read(file);
 
-            if(bufferedImage == null || bufferedImage.equals("")){
+            if(bufferedImage == null || "".equals(bufferedImage)){
                 imageMergeUtilVo.setX(0);
                 imageMergeUtilVo.setY(0);
                 //创建新的画布，宽高以第一个图为准

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/UrlUtil.java

@@ -41,7 +41,7 @@ public class UrlUtil {
             return entity;
         }
         url = url.trim();
-        if (url.equals("")) {
+        if ("".equals(url)) {
             return entity;
         }
         String[] urlParts = url.split("\\?");

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/ValidateFormUtil.java

@@ -40,37 +40,37 @@ public class ValidateFormUtil {
             List<String> val = CrmebUtil.stringToArrayStrRegex(value, ":");
 
             ////必填
-            if(val.get(0).equals("required") && val.get(1).equals("true")){
+            if("required".equals(val.get(0)) && "true".equals(val.get(1))){
                 isRequire(systemConfig.getValue(), systemConfig.getTitle());
                 continue;
             }
 
             //数字
-            if(val.get(0).equals("number") && val.get(1).equals("true")){
+            if("number".equals(val.get(0)) && "true".equals(val.get(1))){
                 isNumber(systemConfig.getValue(), systemConfig.getTitle());
                 continue;
             }
 
             //最大值
-            if(val.get(0).equals("max")){
+            if("max".equals(val.get(0))){
                 isNumber(systemConfig.getValue(), systemConfig.getTitle());
                 continue;
             }
 
             //最小值
-            if(val.get(0).equals("min")){
+            if("min".equals(val.get(0))){
                 isNumber(systemConfig.getValue(), systemConfig.getTitle());
                 continue;
             }
 
             //邮箱
-            if(val.get(0).equals("email") && val.get(1).equals("true")){
+            if("email".equals(val.get(0)) && "true".equals(val.get(1))){
                 isEmail(systemConfig.getValue(), systemConfig.getTitle());
                 continue;
             }
 
             //手机
-            if(val.get(0).equals("phone") && val.get(1).equals("true")){
+            if("phone".equals(val.get(0)) && "true".equals(val.get(1))){
                 isPhone(systemConfig.getValue(), systemConfig.getTitle());
             }
         }

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/WxUtil.java

@@ -55,7 +55,7 @@ public class WxUtil {
         if(ObjectUtil.isNull(result)){
             throw new CrmebException("微信平台接口异常，没任何数据返回！");
         }
-        if(result.containsKey("errcode") && result.getString("errcode").equals("0")){
+        if(result.containsKey("errcode") && "0".equals(result.getString("errcode"))){
             return result;
         }
         if(result.containsKey("errmsg")){

crmeb/crmeb-common/src/main/java/com/zbkj/common/utils/genutils/GenCodeUtils.java

@@ -91,7 +91,7 @@ public class GenCodeUtils {
             columnEntity.setAttrType(attrType);
 
 
-            if (!hasBigDecimal && attrType.equals("BigDecimal")) {
+            if (!hasBigDecimal && "BigDecimal".equals(attrType)) {
                 hasBigDecimal = true;
             }
             if (!hasList && "array".equals(columnEntity.getExtra())) {