fix DateUtil
This commit is contained in:
parent
5c9b0a3a2f
commit
e31a8f5c08
182
CommonUtil.iml
182
CommonUtil.iml
|
|
@ -1,8 +1,188 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module version="4">
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<component name="CheckStyle-IDEA-Module">
|
||||
<option name="configuration">
|
||||
<map />
|
||||
</option>
|
||||
</component>
|
||||
<component name="FacetManager">
|
||||
<facet type="web" name="Web">
|
||||
<configuration>
|
||||
<webroots />
|
||||
<sourceRoots>
|
||||
<root url="file://$MODULE_DIR$/src/main/java" />
|
||||
<root url="file://$MODULE_DIR$/src/main/resources" />
|
||||
</sourceRoots>
|
||||
</configuration>
|
||||
</facet>
|
||||
<facet type="Spring" name="Spring">
|
||||
<configuration />
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||
<output url="file://$MODULE_DIR$/target/classes" />
|
||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.5.3" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.16.1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.vintage:junit-vintage-engine:5.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.6.2" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.3.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.51.Final" level="project" />
|
||||
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:mapper-extras-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:parent-join-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:aggs-matrix-stats-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:rank-eval-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:lang-mustache-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.client:elasticsearch-rest-client:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.12" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.13" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-core:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-secure-sm:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-x-content:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-geo:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-backward-codecs:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-grouping:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-highlighter:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-join:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-misc:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queries:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-sandbox:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial-extras:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-spatial3d:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-suggest:8.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:elasticsearch-cli:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.8.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.10" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.tdunning:t-digest:3.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch:jna:5.7.0-1" level="project" />
|
||||
<orderEntry type="library" scope="RUNTIME" name="Maven: org.elasticsearch:elasticsearch-plugin-classloader:7.13.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.elasticsearch.client:elasticsearch-rest-client-sniffer:7.9.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.5.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.4-7" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.7.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.3" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.kafka:spring-kafka:2.5.4.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.67" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:4.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:bson:4.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:4.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-legacy:4.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.ethz.ganymed:ganymed-ssh2:262" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.googlecode.protobuf-java-format:protobuf-java-format:1.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:2.1.5.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
|
||||
</component>
|
||||
</module>
|
||||
|
|
@ -3,6 +3,7 @@ package site.cnkj.common.utils.data;
|
|||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||
import org.springframework.data.redis.core.Cursor;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.core.ScanOptions;
|
||||
|
|
@ -13,9 +14,9 @@ import java.util.concurrent.TimeUnit;
|
|||
public class RedisUtil {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(RedisUtil.class);
|
||||
|
||||
private RedisTemplate<String, Object> redisTemplate;
|
||||
private final RedisTemplate<String, Object> redisTemplate;
|
||||
|
||||
private String redisName;
|
||||
private final String redisName;
|
||||
|
||||
public RedisUtil(RedisTemplate<String, Object> redisTemplate, String redisName) {
|
||||
this.redisTemplate = redisTemplate;
|
||||
|
|
@ -24,15 +25,18 @@ public class RedisUtil {
|
|||
|
||||
/**
|
||||
* 获取链接的redis的信息，等于Command <info>
|
||||
* @return
|
||||
* @return .
|
||||
*/
|
||||
public Properties info(){
|
||||
try {
|
||||
return redisTemplate.getConnectionFactory().getConnection().info();
|
||||
RedisConnectionFactory connectionFactory = redisTemplate.getConnectionFactory();
|
||||
if (null != connectionFactory){
|
||||
return connectionFactory.getConnection().info();
|
||||
}
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
return new Properties();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,41 +18,41 @@ import java.util.TimeZone;
|
|||
*/
|
||||
public class DateUtil {
|
||||
|
||||
public static enum FORMAT_ENUM{
|
||||
BASETIME_yyyy("yyyy"),
|
||||
BASETIME_MM("MM"),
|
||||
BASETIME_dd("dd"),
|
||||
BASETIME_HH("HH"),
|
||||
BASETIME_mm("mm"),
|
||||
BASETIME_ss("ss"),
|
||||
BASETIME_SSS("SSS"),
|
||||
FULLTIMEBY_yMd("yyyy-MM-dd"),
|
||||
FULLTIMEBY_yMdH("yyyy-MM-dd HH"),
|
||||
FULLTIMEBY_yMdHm("yyyy-MM-dd HH:mm"),
|
||||
FULLTIMEBY_yM("yyyy-MM"),
|
||||
FULLTIMEBY_Md("MM-dd"),
|
||||
FULLTIMEBY_Hms("HH:mm:ss"),
|
||||
FULLTIMEBY_Hm("HH:mm"),
|
||||
FULLTIMEBY_ms("mm:ss"),
|
||||
FULLTIMEBY_HmsS("HH:mm:ss.SSS"),
|
||||
NOSEGMENTATION_yM("yyyyMM"),
|
||||
NOSEGMENTATION_yMd("yyyyMMdd"),
|
||||
NOSEGMENTATION_Hm("HHmm"),
|
||||
NOSEGMENTATION_Hms("HHmmss"),
|
||||
NOSEGMENTATION_HmsS("HHmmssSSS"),
|
||||
NOSEGMENTATION_yMdHm("yyyyMMddHHmm"),
|
||||
NOSEGMENTATION_yMdHms("yyyyMMddHHmmss"),
|
||||
NOSEGMENTATION_yMdHmsS("yyyyMMddHHmmssSSS"),
|
||||
public enum FORMAT{
|
||||
BASE_TIME_yyyy("yyyy"),
|
||||
BASE_TIME_MM("MM"),
|
||||
BASE_TIME_dd("dd"),
|
||||
BASE_TIME_HH("HH"),
|
||||
BASE_TIME_mm("mm"),
|
||||
BASE_TIME_ss("ss"),
|
||||
BASE_TIME_SSS("SSS"),
|
||||
FULL_TIME_yMd("yyyy-MM-dd"),
|
||||
FULL_TIME_yMdH("yyyy-MM-dd HH"),
|
||||
FULL_TIME_yMdHm("yyyy-MM-dd HH:mm"),
|
||||
FULL_TIME_yMdHms("yyyy-MM-dd HH:mm:ss"),
|
||||
FULL_TIME_yMdHmsS("yyyy-MM-dd HH:mm:ss.SSS"),
|
||||
FULL_TIME_yM("yyyy-MM"),
|
||||
FULL_TIME_Md("MM-dd"),
|
||||
FULL_TIME_Hms("HH:mm:ss"),
|
||||
FULL_TIME_Hm("HH:mm"),
|
||||
FULL_TIME_ms("mm:ss"),
|
||||
FULL_TIME_HmsS("HH:mm:ss.SSS"),
|
||||
NO_SEGMENTATION_yM("yyyyMM"),
|
||||
NO_SEGMENTATION_yMd("yyyyMMdd"),
|
||||
NO_SEGMENTATION_Hm("HHmm"),
|
||||
NO_SEGMENTATION_Hms("HHmmss"),
|
||||
NO_SEGMENTATION_HmsS("HHmmssSSS"),
|
||||
NO_SEGMENTATION_yMdHm("yyyyMMddHHmm"),
|
||||
NO_SEGMENTATION_yMdHms("yyyyMMddHHmmss"),
|
||||
NO_SEGMENTATION_yMdHmsS("yyyyMMddHHmmssSSS"),
|
||||
POINT_yMd("yyyy.MM.dd"),
|
||||
POINT_Hms("HH.mm.ss"),
|
||||
FULLTIMEBY_yMdHms("yyyy-MM-dd HH:mm:ss"),
|
||||
FULLTIMEBY_yMdHmsS("yyyy-MM-dd HH:mm:ss.SSS"),
|
||||
FULLTIMEFORMAT_yMd("yyyy年MM月dd日"),
|
||||
FULLTIMEFORMAT_Hms("HH时mm分ss秒"),
|
||||
FULLTIMEFORMAT_yMdHms("yyyy年MM月dd日 HH时mm分ss秒"),
|
||||
FULLTIMEFORMAT_yMdHmsS("yyyy年MM月dd日 HH时mm分ss秒SSS毫秒");
|
||||
FULL_TIME_FORMAT_yMd("yyyy年MM月dd日"),
|
||||
FULL_TIME_FORMAT_Hms("HH时mm分ss秒"),
|
||||
FULL_TIME_FORMAT_yMdHms("yyyy年MM月dd日 HH时mm分ss秒"),
|
||||
FULL_TIME_FORMAT_yMdHmsS("yyyy年MM月dd日 HH时mm分ss秒SSS毫秒");
|
||||
|
||||
FORMAT_ENUM(String value) {
|
||||
FORMAT(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ public class DateUtil {
|
|||
}
|
||||
|
||||
public static String timeStamp2fulltime(Date date){
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue());
|
||||
SimpleDateFormat sdf = new SimpleDateFormat(FORMAT.FULL_TIME_yMdHms.getValue());
|
||||
return sdf.format(date);
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ public class DateUtil {
|
|||
type = "s";
|
||||
}
|
||||
if (timeFormat == null){
|
||||
timeFormat = FORMAT_ENUM.FULLTIMEBY_yMdHmsS.getValue();
|
||||
timeFormat = FORMAT.FULL_TIME_yMdHmsS.getValue();
|
||||
}
|
||||
long date = System.currentTimeMillis();
|
||||
Long now_time = new Long(1);
|
||||
|
|
@ -368,7 +368,7 @@ public class DateUtil {
|
|||
long delayTime = 0;
|
||||
if (executorTime <= 24 && executorTime>0){
|
||||
int num = 24 / executorTime;
|
||||
long tomorrowEarlyMorning = getTodayEarlyMorning(translateTimeToDate(getCurrentTime(), FORMAT_ENUM.FULLTIMEBY_yMdHmsS.getValue()), FORMAT_ENUM.FULLTIMEBY_yMdHmsS.getValue());
|
||||
long tomorrowEarlyMorning = getTodayEarlyMorning(translateTimeToDate(getCurrentTime(), FORMAT.FULL_TIME_yMdHmsS.getValue()), FORMAT.FULL_TIME_yMdHmsS.getValue());
|
||||
long todayEarlyMorning = tomorrowEarlyMorning - 24*60*60*1000;
|
||||
long todayHour = num * executorTime * 3600000 + todayEarlyMorning;
|
||||
if (todayHour < getCurrentTime() && getCurrentTime() < tomorrowEarlyMorning){
|
||||
|
|
@ -431,7 +431,7 @@ public class DateUtil {
|
|||
* @return 2020-03-24 19:24:31
|
||||
*/
|
||||
public static String switchTime(String time) throws ParseException {
|
||||
SimpleDateFormat format2 = new SimpleDateFormat(FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue());
|
||||
SimpleDateFormat format2 = new SimpleDateFormat(FORMAT.FULL_TIME_yMdHms.getValue());
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");//格式化的表达式
|
||||
time = time.replace("Z", " UTC");//是空格+UTC
|
||||
Date data = format.parse(time);
|
||||
|
|
@ -506,7 +506,7 @@ public class DateUtil {
|
|||
!date_format.contains("mm") &&
|
||||
!date_format.contains("ss")){
|
||||
//月
|
||||
String toDate = translateTimeToDate(current_time, FORMAT_ENUM.FULLTIMEBY_yM.getValue());
|
||||
String toDate = translateTimeToDate(current_time, FORMAT.FULL_TIME_yM.getValue());
|
||||
Integer year = Integer.valueOf(toDate.split("-")[0]);
|
||||
Integer month = Integer.valueOf(toDate.split("-")[1]);
|
||||
int shang = parseInt / 12;
|
||||
|
|
@ -521,7 +521,7 @@ public class DateUtil {
|
|||
month = month - 12;
|
||||
}
|
||||
String i5 = month<10?"0"+String.valueOf(month):String.valueOf(month);
|
||||
Long translateDateToTimestamp = translateDateToTimestamp(String.valueOf(year) + "-" + i5, FORMAT_ENUM.FULLTIMEBY_yM.getValue());
|
||||
Long translateDateToTimestamp = translateDateToTimestamp(String.valueOf(year) + "-" + i5, FORMAT.FULL_TIME_yM.getValue());
|
||||
translateTimeToDate = translateTimeToDate(translateDateToTimestamp, date_format);
|
||||
}else if ((date_format.contains("YYYY")||date_format.contains("yyyy")) &&
|
||||
!date_format.contains("MM") &&
|
||||
|
|
@ -530,9 +530,9 @@ public class DateUtil {
|
|||
!date_format.contains("mm") &&
|
||||
!date_format.contains("ss")){
|
||||
//年
|
||||
String year = translateTimeToDate(current_time, FORMAT_ENUM.BASETIME_yyyy.getValue());
|
||||
String year = translateTimeToDate(current_time, FORMAT.BASE_TIME_yyyy.getValue());
|
||||
String value = String.valueOf(Integer.valueOf(year) + parseInt);
|
||||
Long aLong = translateDateToTimestamp(value, FORMAT_ENUM.BASETIME_yyyy.getValue());
|
||||
Long aLong = translateDateToTimestamp(value, FORMAT.BASE_TIME_yyyy.getValue());
|
||||
translateTimeToDate = translateTimeToDate(aLong, date_format);
|
||||
}else {
|
||||
translateTimeToDate = translateTimeToDate(current_time, date_format);
|
||||
|
|
@ -614,13 +614,13 @@ public class DateUtil {
|
|||
*/
|
||||
public static List<JSONObject> getAroundTimeList(String startTime, String endTime, int cut){
|
||||
List<JSONObject> times = new LinkedList<>();
|
||||
Long startTimestamp = translateDateToTimestamp(startTime, FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue())/1000;
|
||||
Long endTimestamp = translateDateToTimestamp(endTime, FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue())/1000;
|
||||
Long startTimestamp = translateDateToTimestamp(startTime, FORMAT.FULL_TIME_yMdHms.getValue())/1000;
|
||||
Long endTimestamp = translateDateToTimestamp(endTime, FORMAT.FULL_TIME_yMdHms.getValue())/1000;
|
||||
List<String> list = splitTimestamp(cut, startTimestamp, endTimestamp);
|
||||
for (String s : list) {
|
||||
String[] split = s.split(",");
|
||||
Date start_time = translateTimestampToDate(Long.valueOf(split[0]), FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue());
|
||||
Date end_time = translateTimestampToDate(Long.valueOf(split[1]), FORMAT_ENUM.FULLTIMEBY_yMdHms.getValue());
|
||||
Date start_time = translateTimestampToDate(Long.valueOf(split[0]), FORMAT.FULL_TIME_yMdHms.getValue());
|
||||
Date end_time = translateTimestampToDate(Long.valueOf(split[1]), FORMAT.FULL_TIME_yMdHms.getValue());
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("startTime", start_time);
|
||||
jsonObject.put("endTime", end_time);
|
||||
|
|
|
|||
|
|
@ -278,12 +278,12 @@ public class FileUtil {
|
|||
}
|
||||
|
||||
public static File getRecoverFileName(String templateName, String paramsNum, String path) throws Exception{
|
||||
String translateTimeToDate = DateUtil.translateTimeToDate(DateUtil.getLastDaysTimestamp(1), DateUtil.FORMAT_ENUM.NOSEGMENTATION_yMd.getValue());
|
||||
String translateTimeToDate = DateUtil.translateTimeToDate(DateUtil.getLastDaysTimestamp(1), DateUtil.FORMAT.NO_SEGMENTATION_yMd.getValue());
|
||||
List<String> fileNames = Arrays.asList(
|
||||
templateName,
|
||||
translateTimeToDate,
|
||||
"00",
|
||||
DateUtil.translateTimeToDate(System.currentTimeMillis(), DateUtil.FORMAT_ENUM.NOSEGMENTATION_yMdHms.getValue()),
|
||||
DateUtil.translateTimeToDate(System.currentTimeMillis(), DateUtil.FORMAT.NO_SEGMENTATION_yMdHms.getValue()),
|
||||
HttpCommonUtil.hostName,
|
||||
paramsNum
|
||||
);
|
||||
|
|
@ -297,14 +297,14 @@ public class FileUtil {
|
|||
|
||||
public static String getLogFileName(String templateName, String paramsNum, String date_format, int date_num) throws Exception{
|
||||
if (StringUtils.isEmpty(date_format)){
|
||||
date_format = DateUtil.FORMAT_ENUM.NOSEGMENTATION_yMdHms.getValue();
|
||||
date_format = DateUtil.FORMAT.NO_SEGMENTATION_yMdHms.getValue();
|
||||
}
|
||||
String translateTimeToDate = DateUtil.translateTimeToDate(DateUtil.getLastDaysTimestamp(date_num), date_format);
|
||||
List<String> fileNames = Arrays.asList(
|
||||
templateName,
|
||||
translateTimeToDate,
|
||||
"00",
|
||||
DateUtil.translateTimeToDate(System.currentTimeMillis(), DateUtil.FORMAT_ENUM.NOSEGMENTATION_yMdHmsS.getValue()),
|
||||
DateUtil.translateTimeToDate(System.currentTimeMillis(), DateUtil.FORMAT.NO_SEGMENTATION_yMdHmsS.getValue()),
|
||||
HttpCommonUtil.hostName,
|
||||
paramsNum
|
||||
);
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public class LoggerUtil {
|
|||
private String traceId = getMDC();
|
||||
private String requestId = MDC.get("requestId");
|
||||
private String hostName = HOST_NAME;//机器名
|
||||
private String time = DateUtil.translateDateToString(new Date(), DateUtil.FORMAT_ENUM.FULLTIMEBY_yMdHmsS.getValue());//时间
|
||||
private String time = DateUtil.translateDateToString(new Date(), DateUtil.FORMAT.FULL_TIME_yMdHmsS.getValue());//时间
|
||||
private Long timestamp = new Date().getTime();
|
||||
private String className = new Throwable().getStackTrace()[4].getClassName();
|
||||
private String methodName = new Throwable().getStackTrace()[4].getMethodName();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user