This commit is contained in:
2026-05-15 09:39:46 +08:00
parent 0beae4f20e
commit ff996cbc43
2 changed files with 9 additions and 7 deletions

View File

@@ -1,15 +1,17 @@
# 使用你自建的精简 JRE 基础镜像(非 root, JVM 优化, 时区等已配置)
FROM moshangjunmowen/jdk-jre:v17.0.19
# 临时切换 root 创建日志目录,并授权给 appuser
USER root
RUN mkdir -p /home/logs && chown appuser:appuser /home/logs
# 恢复非 root 用户
USER appuser
ARG JAR_FILE
LABEL maintainer="moshangjunmowen@foxmail.com"
# 复制 JAR 并设置所有权给非 root 用户 appuser (uid=1001)
COPY --chown=appuser:appuser ${JAR_FILE} /app/app.jar
# 通过追加 JAVA_TOOL_OPTIONS 来安全注入额外 JVM 参数
# 注意:基础镜像已设定 -Xmx1024M -Xms256M这里合并不会覆盖
ENV JAVA_TOOL_OPTIONS="-Djava.security.egd=file:/dev/./urandom ${JAVA_TOOL_OPTIONS}"
# 保持基础镜像的 ENTRYPOINT ["java", "-jar"],只需指定 jar 路径
CMD ["/app/app.jar"]

View File

@@ -1,6 +1,6 @@
package online.junmowen.blog.admin.module.business.goods.service;
import org.apache.fesod.sheet.FastExcel;
import org.apache.fesod.sheet.FesodSheet;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
@@ -173,7 +173,7 @@ public class GoodsService {
public ResponseDTO<String> importGoods(MultipartFile file) {
List<GoodsImportForm> dataList;
try {
dataList = FastExcel.read(file.getInputStream()).head(GoodsImportForm.class)
dataList = FesodSheet.read(file.getInputStream()).head(GoodsImportForm.class)
.sheet()
.doReadSync();
} catch (IOException e) {