From d6e6b993166e6ca278b29df83c1bd0a01aaaaf9b Mon Sep 17 00:00:00 2001
From: 我以为 <870044273@qq.com>
Date: Thu, 02 Jun 2022 11:00:16 +0800
Subject: [PATCH] 修正OpenFeign部分情况下传递header认证信息为空问题 #https://gitee.com/y_project/RuoYi-Cloud/issues/I5AGRR
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
index f78fbbe..e7dc024 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -5,6 +5,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
/**
@@ -52,11 +54,6 @@
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/**
- * 导出类型（0数字 1字符串）
- */
- public ColumnType cellType() default ColumnType.STRING;
-
- /**
* 导出时在excel中每个列的高度 单位为字符
*/
public double height() default 14;
@@ -102,9 +99,19 @@
public boolean isStatistics() default false;
/**
- * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+ * 导出类型（0数字 1字符串）
*/
- public Align align() default Align.AUTO;
+ public ColumnType cellType() default ColumnType.STRING;
+
+ /**
+ * 导出字体颜色
+ */
+ public IndexedColors color() default IndexedColors.BLACK;
+
+ /**
+ * 导出字段对齐方式
+ */
+ public HorizontalAlignment align() default HorizontalAlignment.CENTER;
/**
* 自定义数据处理器
@@ -115,22 +122,6 @@
* 自定义数据处理器参数
*/
public String[] args() default {};
-
- public enum Align
- {
- AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
- private final int value;
-
- Align(int value)
- {
- this.value = value;
- }
-
- public int value()
- {
- return this.value;
- }
- }
/**
* 字段类型（0：导出导入；1：仅导出；2：仅导入）
--
Gitblit v1.9.3