feat: upgrade framework 3.6.5

2024-11-22 17:24:07 +08:00
parent 64abc8d59a 235c029bac
commit 749471b1dd
93 changed files with 2220 additions and 1324 deletions
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/SecurityConstants.java
@@ -20,7 +20,7 @@ public class SecurityConstants
    /**
     * 授权信息字段
     */
-    public static final String AUTHORIZATION_HEADER = "authorization";
+    public static final String AUTHORIZATION_HEADER = "Authorization";

    /**
     * 请求来源
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/TokenConstants.java
@@ -7,11 +7,6 @@ package org.wfc.common.core.constant;
 */
 public class TokenConstants
 {
-    /**
-     * 令牌自定义标识
-     */
-    public static final String AUTHENTICATION = "Authorization";
-
    /**
     * 令牌前缀
     */
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/constant/UserConstants.java
@@ -21,6 +21,9 @@ public class UserConstants
    /** 用户封禁状态 */
    public static final String USER_DISABLE = "1";

+    /** 角色正常状态 */
+    public static final String ROLE_NORMAL = "0";
+
    /** 角色封禁状态 */
    public static final String ROLE_DISABLE = "1";

--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/text/Convert.java
@@ -364,6 +364,10 @@ public class Convert
     */
    public static String[] toStrArray(String str)
    {
+        if (StringUtils.isEmpty(str))
+        {
+            return new String[] {};
+        }
        return toStrArray(",", str);
    }

--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/PageUtils.java
@@ -4,8 +4,6 @@ import com.github.pagehelper.PageHelper;
 import org.wfc.common.core.utils.sql.SqlUtil;
 import org.wfc.common.core.web.page.PageDomain;
 import org.wfc.common.core.web.page.TableSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 /**
 * 分页工具类
@@ -14,8 +12,6 @@ import org.slf4j.LoggerFactory;
 */
 public class PageUtils extends PageHelper
 {
-//    logger
-    public static final Logger logger = LoggerFactory.getLogger(PageUtils.class);
    /**
     * 设置请求分页数据
     */
@@ -24,7 +20,6 @@ public class PageUtils extends PageHelper
        PageDomain pageDomain = TableSupport.buildPageRequest();
        Integer pageNum = pageDomain.getPageNum();
        Integer pageSize = pageDomain.getPageSize();
-        logger.info("Setting up page data{} {}", pageNum, pageSize);
        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
        Boolean reasonable = pageDomain.getReasonable();
        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/utils/poi/ExcelUtil.java
@@ -167,6 +167,11 @@ public class ExcelUtil<T>
     */
    public Class<T> clazz;

+    /**
+     * 需要显示列属性
+     */
+    public String[] includeFields;
+
    /**
     * 需要排除列属性
     */
@@ -177,11 +182,20 @@ public class ExcelUtil<T>
        this.clazz = clazz;
    }

+    /**
+     * 仅在Excel中显示列属性
+     *
+     * @param fields 列属性名 示例[单个"name"/多个"id","name"]
+     */
+    public void showColumn(String... fields)
+    {
+        this.includeFields = fields;
+    }
+
    /**
     * 隐藏Excel中列属性
     *
     * @param fields 列属性名 示例[单个"name"/多个"id","name"]
-     * @throws Exception
     */
    public void hideColumn(String... fields)
    {
@@ -1280,46 +1294,86 @@ public class ExcelUtil<T>
        List<Field> tempFields = new ArrayList<>();
        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-        for (Field field : tempFields)
+        if (StringUtils.isNotEmpty(includeFields))
        {
-            if (!ArrayUtils.contains(this.excludeFields, field.getName()))
+            for (Field field : tempFields)
            {
-                // 单注解
-                if (field.isAnnotationPresent(Excel.class))
+                if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))
                {
-                    Excel attr = field.getAnnotation(Excel.class);
-                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+                    addField(fields, field);
+                }
+            }
+        }
+        else if (StringUtils.isNotEmpty(excludeFields))
+        {
+            for (Field field : tempFields)
+            {
+                if (!ArrayUtils.contains(this.excludeFields, field.getName()))
+                {
+                    addField(fields, field);
+                }
+            }
+        }
+        else
+        {
+            for (Field field : tempFields)
+            {
+                addField(fields, field);
+            }
+        }
+        return fields;
+    }
+
+    /**
+     * 添加字段信息
+     */
+    public void addField(List<Object[]> fields, Field field)
+    {
+        // 单注解
+        if (field.isAnnotationPresent(Excel.class))
+        {
+            Excel attr = field.getAnnotation(Excel.class);
+            if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+            {
+                field.setAccessible(true);
+                fields.add(new Object[] { field, attr });
+            }
+            if (Collection.class.isAssignableFrom(field.getType()))
+            {
+                subMethod = getSubMethod(field.getName(), clazz);
+                ParameterizedType pt = (ParameterizedType) field.getGenericType();
+                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
+                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+            }
+        }
+
+        // 多注解
+        if (field.isAnnotationPresent(Excels.class))
+        {
+            Excels attrs = field.getAnnotation(Excels.class);
+            Excel[] excels = attrs.value();
+            for (Excel attr : excels)
+            {
+                if (StringUtils.isNotEmpty(includeFields))
+                {
+                    if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())
+                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
                    {
                        field.setAccessible(true);
                        fields.add(new Object[] { field, attr });
                    }
-                    if (Collection.class.isAssignableFrom(field.getType()))
-                    {
-                        subMethod = getSubMethod(field.getName(), clazz);
-                        ParameterizedType pt = (ParameterizedType) field.getGenericType();
-                        Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                        this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
-                    }
                }
-
-                // 多注解
-                if (field.isAnnotationPresent(Excels.class))
+                else
                {
-                    Excels attrs = field.getAnnotation(Excels.class);
-                    Excel[] excels = attrs.value();
-                    for (Excel attr : excels)
+                    if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
                    {
-                        if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
-                                && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
-                        {
-                            field.setAccessible(true);
-                            fields.add(new Object[] { field, attr });
-                        }
+                        field.setAccessible(true);
+                        fields.add(new Object[] { field, attr });
                    }
                }
            }
        }
-        return fields;
    }

    /**
--- a/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java
+++ b/wfc-common/wfc-common-core/src/main/java/org/wfc/common/core/web/page/TableDataInfo.java
@@ -2,7 +2,6 @@ package org.wfc.common.core.web.page;

 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;

 /**
 * 表格分页数据对象