Pre Merge pull request !422 from root/N/A

Signed-off-by: root <15907907+xuezhihongg@user.noreply.gitee.com>

docker/nginx/conf/nginx.conf

@@ -28,10 +28,9 @@ http {
             proxy_pass http://ruoyi-gateway:8080/;
         }
 
-        # 避免actuator暴露
+        # springdoc proxy
-        if ($uri ~ "/actuator") {
+        location~^/v3/api-docs/(.*){
-            return 403;
+            proxy pass http://localhost:8080/v3/api-docs/$1;
-        }
 
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -1004,7 +1004,7 @@ public class ExcelUtil<T>
                 String separator = attr.separator();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
+                    cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1034,6 +1034,21 @@ public class ExcelUtil<T>
         return cell;
     }
 
+    /**
+     * 使用自定义格式，同时避免样式污染
+     * 
+     * @param cellStyle 从此样式复制
+     * @param format 格式匹配的字符串
+     * @return 格式化后CellStyle对象
+     */
+    private CellStyle createCellStyle(CellStyle cellStyle, String format)
+    {
+        CellStyle style = wb.createCellStyle();
+        style.cloneStyleFrom(cellStyle);
+        style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));
+        return style;
+    }
+
     /**
      * 设置 POI XSSFSheet 单元格提示或选择框
      *