diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c5c661d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +#|- home +# |- app.jar - 启动jar包 +# |-logs - 日志文件 + +#指定构建镜像的起始镜像 +FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/dragonwell:17.0.4.0.4.8-standard-ga-8.6 + +#定义时区参数 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone + +#挂载工作目录 +VOLUME ["/home/logs/cloud-system"] + +#拷贝执行jar包文件 +COPY ./target/cloud-system.jar /home/app.jar + +#构建启动命令 +ENTRYPOINT ["java", "-jar"] +CMD ["home/app.jar"] diff --git a/pom.xml b/pom.xml index a0ac17b..e9346c3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - cloud-modules-system + cloud-system cloud-modules-system系统模块 diff --git a/src/main/java/com/muyu/system/domain/SysNotice.java b/src/main/java/com/muyu/system/domain/SysNotice.java index b5e823f..8f50fe7 100644 --- a/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/src/main/java/com/muyu/system/domain/SysNotice.java @@ -1,5 +1,6 @@ package com.muyu.system.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; import lombok.AllArgsConstructor; @@ -11,6 +12,7 @@ import lombok.experimental.SuperBuilder; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; +import java.util.Date; import java.util.List; /** @@ -73,6 +75,18 @@ public class SysNotice extends BaseEntity { private String createBy; + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + /** + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")