Merge remote-tracking branch 'origin/master'

lohir

2024-10-18 1a00df812740751806e6d17a7b5a184fe97157d4

Merge remote-tracking branch 'origin/master'

 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","&>","&"]



 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">