提交 e0923bd4 authored 作者: 吕本才's avatar 吕本才

1、解决hutool依赖问题

2、增加dockerfile
上级 ed076704
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/
*.iws
*.iml
*.ipr
### Eclipse ###
### STS ###
.apt_generated
.classpath
.factorypath
......@@ -17,6 +12,14 @@ target/
.settings
.springBeans
.sts4-cache
.mvn
logs
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
......@@ -31,5 +34,5 @@ build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store
mvnw
mvnw.cmd
FROM openjdk:8
WORKDIR /link
ARG ACTIVE=abc
ADD ./target/wangxiaolu-link-module-report.jar /link/app.jar
#设置时区
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
# 定义容器启动命令ENTRYPOINT 和 CMD指令类似,都可以用于增加启动参数
ENTRYPOINT ["nohup","java", "-jar", "/link/app.jar"]
CMD ["--spring.profiles.active=${ACTIVE}"]
EXPOSE 9205
......@@ -18,10 +18,7 @@
<artifactId>wangxiaolu-link-report</artifactId>
<version>0.0.1</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
......@@ -93,18 +90,41 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
<version>1.9.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
</dependency>
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
......
package com.link.report.service.impl;
import cn.hutool.core.date.DateUtil;
import com.sfa.common.core.utils.DateUtils;
import com.sfa.common.core.utils.ServletUtils;
import com.sfa.common.security.service.TokenService;
import com.sfa.common.security.utils.SecurityUtils;
......@@ -114,7 +113,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
LoginUser loginUser = tokenService.getLoginUser(token);
map.put("sysUserCode", loginUser.getUsername());
//设置当前日期(年月日)
map.put("sysData", DateUtils.getDate());
map.put("sysData", DateUtil.date());
//设置昨天日期(年月日)
map.put("sysYesterDay", DateUtil.yesterday());
//设置当前登录用户昵称
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论