From 1a00df812740751806e6d17a7b5a184fe97157d4 Mon Sep 17 00:00:00 2001 From: lohir <3399054449@qq.com> Date: 星期五, 18 十月 2024 17:14:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mapper/EducationResourceMapper.xml | 2 +- src/docker/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 1e17b71..739e440 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -1,3 +1,5 @@ +config config.js DmJdbcDriver18.jar dm.sql Dockerfile files jdk17.tar jdk8.tar jxkg-3.9.0.jar logs nohup.out simsun.ttc +[root@localhost java]# vi Dockerfile # 鍩虹闀滃儚 FROM openjdk:17-alpine # 浣滆�� @@ -6,6 +8,8 @@ WORKDIR /usr/local/java # 澶嶅埗瀹嬩綋瀛椾綋锛堣矾寰勭浉瀵逛簬dockerfile鐨勮矾寰勶級 COPY simsun.ttc /usr/share/fonts/ +# easyExcel瀛椾綋 +RUN apk add fontconfig && apk add --update ttf-dejavu && fc-cache --force # 鍚屾docker鍐呴儴鐨勬椂闂� RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # 璁剧疆鏃跺尯 @@ -13,8 +17,7 @@ EXPOSE 8000 # 澶嶅埗jar鍖呭埌/user/local/java涓� ARG JAR_FILE -ADD ${JAR_FILE} ./xp.jar +ADD ${JAR_FILE} ./jxkg.jar ENTRYPOINT ["nohup","java","-Dspring.profiles.active=prod","-Dspring.config.location=/usr/local/java/config/application.yml,/usr/local/java/config/application-prod.yml","-jar","/usr/local/java/jxkg-3.9.0.jar",">","/usr/local/java/jxkg.log","&>","&"] - diff --git a/src/main/resources/mapper/EducationResourceMapper.xml b/src/main/resources/mapper/EducationResourceMapper.xml index 4180bc8..4bc65fb 100644 --- a/src/main/resources/mapper/EducationResourceMapper.xml +++ b/src/main/resources/mapper/EducationResourceMapper.xml @@ -79,7 +79,7 @@ <insert id="add" keyColumn="id" useGeneratedKeys="true"> INSERT INTO t_education_resource(content_type, content_url, subject_id, introduction, create_time, update_time, attachment,create_user,class_id) - value (#{form.contentType}, #{form.contentUrl}, #{form.subjectId}, #{form.introduction}, #{form.createTime}, #{form.updateTime}, #{form.attachment},#{form.createUser},#{form.classId}) + values (#{form.contentType}, #{form.contentUrl}, #{form.subjectId}, #{form.introduction}, #{form.createTime}, #{form.updateTime}, #{form.attachment},#{form.createUser},#{form.classId}) </insert> <update id="update"> -- Gitblit v1.8.0