diff options
| author | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-04-01 14:32:41 +0800 |
|---|---|---|
| committer | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-04-01 14:32:41 +0800 |
| commit | 344856a3df4c9c413a53d150f38844fda000c0f4 (patch) | |
| tree | 11ea9a67ca9d2a7f143323f326994eb855506471 | |
| parent | 453ec5b17ef2385021b12cb25770770869900c15 (diff) | |
utcs时区设置
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 51 | ||||
| -rw-r--r-- | src/main/java/com/mesa/reportservice/ReportserviceApplication.java | 5 |
3 files changed, 40 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c090aa9..905fc47 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,7 +21,7 @@ COPY ${JAR_FILE} galaxy-report-service.xjar #dockercompose set JAVA_OPTS ENV JAVA_OPTS=" -Xms1024m -Xmx2048m " -ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 +ENV LANG=C.UTF-8 #ENV TZ=Asia/Almaty #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ENTRYPOINT [ "sh", "-c", "./xjar java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar galaxy-report-service.xjar" ]
\ No newline at end of file @@ -10,7 +10,7 @@ </parent> <groupId>com.mesa</groupId> <artifactId>galaxy-report-service</artifactId> - <version>21.09.13</version> + <version>22.03.18</version> <name>galaxy-report-service</name> <packaging>jar</packaging> <description>Demo project for Spring Boot</description> @@ -45,7 +45,11 @@ <dependencies> - + <dependency> + <groupId>com.github.ulisesbocchio</groupId> + <artifactId>jasypt-spring-boot-starter</artifactId> + <version>2.1.1</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -83,7 +87,32 @@ </exclusions> </dependency> - + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.17.0</version> + <exclusions> + <exclusion> + <artifactId>log4j-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-web</artifactId> + <version>2.17.0</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>2.17.0</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>2.17.0</version> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> @@ -117,18 +146,6 @@ </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-log4j2</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-web</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </dependency> - <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> <version>1.7.2</version> @@ -292,13 +309,13 @@ <forceTags>true</forceTags> <imageTags> - <imageTag>21.09.13</imageTag> + <imageTag>22.03.18</imageTag> </imageTags> <!--远程docker构建，供dockerfile使用--> <dockerHost>http://192.168.40.153:2375</dockerHost> <dockerDirectory>docker</dockerDirectory> <buildArgs> - <JDK_IMAGE>192.168.40.153:9080/common/jdk:1.8.0_73-jre</JDK_IMAGE> + <JDK_IMAGE>192.168.40.153:9080/common/jdk:1.8.0_202</JDK_IMAGE> <GO_IMAGE>192.168.40.153:9080/common/golang:1.15.6</GO_IMAGE> <JAR_FILE>${project.build.finalName}.xjar</JAR_FILE> </buildArgs> diff --git a/src/main/java/com/mesa/reportservice/ReportserviceApplication.java b/src/main/java/com/mesa/reportservice/ReportserviceApplication.java index a830521..4751d77 100644 --- a/src/main/java/com/mesa/reportservice/ReportserviceApplication.java +++ b/src/main/java/com/mesa/reportservice/ReportserviceApplication.java @@ -9,6 +9,8 @@ import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; +import java.util.TimeZone; + @ServletComponentScan @SpringBootApplication @@ -16,6 +18,9 @@ import org.springframework.scheduling.annotation.EnableScheduling; public class ReportserviceApplication { public static void main(String[] args) { + System.setProperty("jasypt.encryptor.password", "galaxy"); + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); SpringApplication.run(ReportserviceApplication.class, args); } |