From bed51b4831befb616564a75079666e094db9698c Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 2 Feb 2024 22:07:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 Sonar、Codacy 扫描问题
---
 .../continew/starter/core/util/IpUtils.java        |  3 +--
 .../datapermission/DataPermissionHandlerImpl.java  | 14 ++++++++------
 .../starter/file/excel/util/ExcelUtils.java        |  7 +++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java
index 1998db2a..c93e533d 100644
--- a/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java
+++ b/continew-starter-core/src/main/java/top/charles7c/continew/starter/core/util/IpUtils.java
@@ -65,7 +65,6 @@ public class IpUtils {
      * @return 是否为内网 IP
      */
     public static boolean isInnerIp(String ip) {
-        ip = "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip);
-        return NetUtil.isInnerIP(ip);
+        return NetUtil.isInnerIP("0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip));
     }
 }
diff --git a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java
index cc3d13f6..10262b81 100644
--- a/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java
+++ b/continew-starter-data/continew-starter-data-mybatis-plus/src/main/java/top/charles7c/continew/starter/data/mybatis/plus/datapermission/DataPermissionHandlerImpl.java
@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Set;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
 
@@ -67,11 +68,12 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
             Method[] methodArr = clazz.getMethods();
             for (Method method : methodArr) {
                 DataPermission dataPermission = method.getAnnotation(DataPermission.class);
-                if (null != dataPermission && (method.getName().equals(methodName) || (method.getName() + "_COUNT")
-                    .equals(methodName))) {
-                    if (dataPermissionFilter.isFilter()) {
-                        return buildDataScopeFilter(dataPermission, where);
-                    }
+                String name = method.getName();
+                if (null == dataPermission || !StrUtil.equalsAny(methodName, name, name + "_COUNT")) {
+                    continue;
+                }
+                if (dataPermissionFilter.isFilter()) {
+                    return buildDataScopeFilter(dataPermission, where);
                 }
             }
         } catch (ClassNotFoundException e) {
@@ -227,7 +229,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
      */
     private Column buildColumn(String tableAlias, String columnName) {
         if (StringUtils.isNotEmpty(tableAlias)) {
-            columnName = String.format("%s.%s", tableAlias, columnName);
+            return new Column(String.format("%s.%s", tableAlias, columnName));
         }
         return new Column(columnName);
     }
diff --git a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java b/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java
index 397ff932..98440a6f 100644
--- a/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java
+++ b/continew-starter-file/continew-starter-file-excel/src/main/java/top/charles7c/continew/starter/file/excel/util/ExcelUtils.java
@@ -70,10 +70,9 @@ public class ExcelUtils {
                                   Class<T> clazz,
                                   HttpServletResponse response) {
         try {
-            fileName = String.format("%s_%s.xlsx", fileName, DateUtil
-                .format(new Date(), DatePattern.PURE_DATETIME_PATTERN));
-            fileName = URLUtil.encode(fileName);
-            response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+            String exportFileName = URLUtil.encode(String.format("%s_%s.xlsx", fileName, DateUtil
+                .format(new Date(), DatePattern.PURE_DATETIME_PATTERN)));
+            response.setHeader("Content-disposition", "attachment;filename=" + exportFileName);
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
             EasyExcel.write(response.getOutputStream(), clazz)
                 .autoCloseStream(false)