Pre Merge pull request !446 from 机智平/master

docker/docker-compose.yml

@@ -7,11 +7,16 @@ services:
       context: ./nacos
     environment:
       - MODE=standalone
+      - NACOS_AUTH_ENABLE=true
+      - NACOS_AUTH_TOKEN=5ZGQ5ZmJ5Lq75L2g5L2K5Yqo5ZyB5Lqf5Yqg5a+555qE5Y+P5Z2w5Y+R5LiA5LiK5ZaP5a6h5Y+R5LqU55CG5ZOB5ZuX
+      - NACOS_AUTH_IDENTITY_KEY=nacosKey
+      - NACOS_AUTH_IDENTITY_VALUE=nacosValue
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
     ports:
       - "8848:8848"
+      - "8080:8080"
       - "9848:9848"
       - "9849:9849"
     depends_on:

docker/nacos/conf/application.properties

@@ -30,3 +30,5 @@ nacos.core.auth.server.identity.key=serverIdentity
 nacos.core.auth.server.identity.value=security
 
 nacos.istio.mcp.server.enabled=false
+
+nacos.core.auth.plugin.nacos.token.secret.key=5ZGQ5ZmJ5Lq75L2g5L2K5Yqo5ZyB5Lqf5Yqg5a+555qE5Y+P5Z2w5Y+R5LiA5LiK5ZaP5a6h5Y+R5LqU55CG5ZOB5ZuX

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

@@ -1003,7 +1003,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))
@@ -1033,6 +1033,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 单元格提示或选择框
      *