Skip to content

GitLab

S
schbrain-parent
Commit e212b712 authored by liaozan's avatar liaozan 🏀
Browse files
Options

Remove DateTimeFormatters.java

parent 83a43af2
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 81 deletions
commons/common-util/pom.xml
View file @ e212b712
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
<groupId>com.schbrain.common</groupId> <groupId>com.schbrain.common</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId> <artifactId>hutool-all</artifactId>
...@@ -67,11 +63,12 @@ ...@@ -67,11 +63,12 @@
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
</dependency> </dependency>
<!-- Optional -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId> <artifactId>spring-boot-starter-aop</artifactId>
<optional>true</optional>
</dependency> </dependency>
<!-- Optional -->
<dependency> <dependency>
<groupId>org.redisson</groupId> <groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId> <artifactId>redisson-spring-boot-starter</artifactId>
...@@ -100,4 +97,4 @@ ...@@ -100,4 +97,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
commons/common-util/src/main/java/com/schbrain/common/util/support/jackson/JavaTimeModule.java
View file @ e212b712
package com.schbrain.common.util.support.jackson; package com.schbrain.common.util.support.jackson;
import cn.hutool.core.date.DatePattern;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.deser.*; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.*; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.schbrain.common.constants.DateTimeFormatters; import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import java.time.*; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
/** /**
* @author liaozan * @author liaozan
...@@ -20,17 +26,13 @@ public class JavaTimeModule extends SimpleModule { ...@@ -20,17 +26,13 @@ public class JavaTimeModule extends SimpleModule {
} }
protected void setup() { protected void setup() {
this.addSerializer(YearMonth.class, new YearMonthSerializer(DateTimeFormatters.YEAR_MONTH)); this.addSerializer(LocalDate.class, new LocalDateSerializer(DatePattern.NORM_DATE_FORMATTER));
this.addSerializer(MonthDay.class, new MonthDaySerializer(DateTimeFormatters.MONTH_DATE)); this.addSerializer(LocalTime.class, new LocalTimeSerializer(DatePattern.NORM_TIME_FORMATTER));
this.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatters.DATE)); this.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DatePattern.NORM_DATETIME_FORMATTER));
this.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatters.TIME));
this.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatters.DATE_TIME)); this.addDeserializer(LocalDate.class, new LocalDateDeserializer(DatePattern.NORM_DATE_FORMATTER));
this.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DatePattern.NORM_TIME_FORMATTER));
this.addDeserializer(YearMonth.class, new YearMonthDeserializer(DateTimeFormatters.YEAR_MONTH)); this.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DatePattern.NORM_DATETIME_FORMATTER));
this.addDeserializer(MonthDay.class, new MonthDayDeserializer(DateTimeFormatters.MONTH_DATE));
this.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatters.DATE));
this.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatters.TIME));
this.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatters.DATE_TIME));
} }
} }
\ No newline at end of file
commons/common/src/main/java/com/schbrain/common/constants/DateTimeFormatters.java deleted 100644 → 0
View file @ 83a43af2
package com.schbrain.common.constants;
import java.time.format.DateTimeFormatter;
import static java.time.ZoneId.systemDefault;
import static java.time.format.DateTimeFormatter.ofPattern;
/**
* @author liaozan
* @since 2021/10/15
*/
public class DateTimeFormatters {
public static final String YEAR_MONTH_PATTERN = "yyyy-MM";
public static final String MONTH_DATE_PATTERN = "MM-dd";
public static final String DATE_PATTERN = "yyyy-MM-dd";
public static final String DATE_PATTERN_WITH_DOT = "yyyy.MM.dd";
public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
public static final String TIME_PATTERN = "HH:mm:ss";
public static final String YEAR_MONTH_WITH_SLASH_PATTERN = "yyyy/MM";
public static final String DATE_WITH_SLASH_PATTERN = "yyyy/MM/dd";
public static final DateTimeFormatter YEAR_MONTH = ofPattern(YEAR_MONTH_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter MONTH_DATE = ofPattern(MONTH_DATE_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter DATE = ofPattern(DATE_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter DATE_WITH_DOT = ofPattern(DATE_PATTERN_WITH_DOT).withZone(systemDefault());
public static final DateTimeFormatter DATE_TIME = ofPattern(DATE_TIME_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter TIME = ofPattern(TIME_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter YEAR_MONTH_WITH_SLASH = ofPattern(YEAR_MONTH_WITH_SLASH_PATTERN).withZone(systemDefault());
public static final DateTimeFormatter DATE_WITH_SLASH = ofPattern(DATE_WITH_SLASH_PATTERN).withZone(systemDefault());
}
\ No newline at end of file
starters/logger-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/logger/logstash/EventDateStringValueJsonProvider.java
View file @ e212b712
package com.schbrain.framework.autoconfigure.logger.logstash; package com.schbrain.framework.autoconfigure.logger.logstash;
import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ILoggingEvent;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.schbrain.common.constants.DateTimeFormatters;
import net.logstash.logback.composite.AbstractFieldJsonProvider; import net.logstash.logback.composite.AbstractFieldJsonProvider;
import net.logstash.logback.composite.JsonWritingUtils; import net.logstash.logback.composite.JsonWritingUtils;
import java.io.IOException; import java.io.IOException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/** /**
* @author liaozan * @author liaozan
...@@ -18,6 +19,8 @@ public class EventDateStringValueJsonProvider extends AbstractFieldJsonProvider< ...@@ -18,6 +19,8 @@ public class EventDateStringValueJsonProvider extends AbstractFieldJsonProvider<
private static final String FIELD_EVENT_DATE = "eventDate"; private static final String FIELD_EVENT_DATE = "eventDate";
private static final DateTimeFormatter DATE_WITH_DOT = DatePattern.createFormatter("yyyy.MM.dd");
public EventDateStringValueJsonProvider() { public EventDateStringValueJsonProvider() {
setFieldName(FIELD_EVENT_DATE); setFieldName(FIELD_EVENT_DATE);
} }
...@@ -29,7 +32,7 @@ public class EventDateStringValueJsonProvider extends AbstractFieldJsonProvider< ...@@ -29,7 +32,7 @@ public class EventDateStringValueJsonProvider extends AbstractFieldJsonProvider<
private String getEventDate(ILoggingEvent event) { private String getEventDate(ILoggingEvent event) {
LocalDateTime eventTime = LocalDateTimeUtil.of(event.getTimeStamp()); LocalDateTime eventTime = LocalDateTimeUtil.of(event.getTimeStamp());
return DateTimeFormatters.DATE_WITH_DOT.format(eventTime); return DATE_WITH_DOT.format(eventTime);
} }
} }
\ No newline at end of file
starters/oss-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/oss/util/OssUtils.java
View file @ e212b712
package com.schbrain.framework.autoconfigure.oss.util; package com.schbrain.framework.autoconfigure.oss.util;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.StrFormatter; import cn.hutool.core.text.StrFormatter;
import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.URLUtil;
...@@ -14,7 +15,6 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials; ...@@ -14,7 +15,6 @@ import com.aliyuncs.auth.sts.AssumeRoleResponse.Credentials;
import com.aliyuncs.http.MethodType; import com.aliyuncs.http.MethodType;
import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.DefaultProfile;
import com.aliyuncs.profile.IClientProfile; import com.aliyuncs.profile.IClientProfile;
import com.schbrain.common.constants.DateTimeFormatters;
import com.schbrain.common.util.ApplicationName; import com.schbrain.common.util.ApplicationName;
import com.schbrain.common.util.ValidateUtils; import com.schbrain.common.util.ValidateUtils;
import com.schbrain.framework.autoconfigure.oss.bean.*; import com.schbrain.framework.autoconfigure.oss.bean.*;
...@@ -29,6 +29,7 @@ import java.io.InputStream; ...@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.time.*; import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -37,10 +38,11 @@ import java.util.stream.Collectors; ...@@ -37,10 +38,11 @@ import java.util.stream.Collectors;
* @author liaozan * @author liaozan
* @since 2021/12/3 * @since 2021/12/3
*/ */
@SuppressWarnings("unused")
@Slf4j @Slf4j
public class OssUtils { public class OssUtils {
private static final DateTimeFormatter DATE_WITH_SLASH = DatePattern.createFormatter("yyyy/MM/dd");
private static OSSClient ossClient; private static OSSClient ossClient;
private static DefaultAcsClient stsAcsClient; private static DefaultAcsClient stsAcsClient;
...@@ -189,7 +191,7 @@ public class OssUtils { ...@@ -189,7 +191,7 @@ public class OssUtils {
public static String buildUploadPath(String objectKey) { public static String buildUploadPath(String objectKey) {
objectKey = removePossibleSlash(objectKey); objectKey = removePossibleSlash(objectKey);
String date = DateTimeFormatters.DATE_WITH_SLASH.format(LocalDate.now()); String date = DATE_WITH_SLASH.format(LocalDate.now());
return String.format("%s/%s/%s", directory, date, objectKey); return String.format("%s/%s/%s", directory, date, objectKey);
} }
...@@ -390,4 +392,4 @@ public class OssUtils { ...@@ -390,4 +392,4 @@ public class OssUtils {
return request; return request;
} }
} }
\ No newline at end of file
support/schbrain-spring-support/src/main/java/com/schbrain/framework/support/spring/defaults/DefaultPropertiesEnvironmentPostProcessor.java
View file @ e212b712
package com.schbrain.framework.support.spring.defaults; package com.schbrain.framework.support.spring.defaults;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.text.StrFormatter; import cn.hutool.core.text.StrFormatter;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import com.schbrain.common.constants.DateTimeFormatters;
import com.schbrain.common.util.EnvUtils; import com.schbrain.common.util.EnvUtils;
import com.schbrain.common.util.PortUtils; import com.schbrain.common.util.PortUtils;
import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor; import com.schbrain.framework.support.spring.LoggerAwareEnvironmentPostProcessor;
...@@ -61,10 +61,10 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro ...@@ -61,10 +61,10 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro
// mvc // mvc
defaultProperties.put("spring.mvc.throw-exception-if-no-handler-found", true); defaultProperties.put("spring.mvc.throw-exception-if-no-handler-found", true);
// datetime // datetime
defaultProperties.put("spring.mvc.format.date", DateTimeFormatters.DATE_PATTERN); defaultProperties.put("spring.mvc.format.date", DatePattern.NORM_DATE_PATTERN);
defaultProperties.put("spring.mvc.format.time", DateTimeFormatters.TIME_PATTERN); defaultProperties.put("spring.mvc.format.time", DatePattern.NORM_TIME_FORMAT);
defaultProperties.put("spring.mvc.format.date-time", DateTimeFormatters.DATE_TIME_PATTERN); defaultProperties.put("spring.mvc.format.date-time", DatePattern.NORM_DATETIME_PATTERN);
defaultProperties.put("spring.jackson.date-format", DateTimeFormatters.DATE_TIME_PATTERN); defaultProperties.put("spring.jackson.date-format", DatePattern.NORM_DATETIME_PATTERN);
defaultProperties.put("spring.jackson.time-zone", TimeZone.getDefault()); defaultProperties.put("spring.jackson.time-zone", TimeZone.getDefault());
// others // others
defaultProperties.put("spring.mandatory-file-encoding", StandardCharsets.UTF_8.name()); defaultProperties.put("spring.mandatory-file-encoding", StandardCharsets.UTF_8.name());
...@@ -111,4 +111,4 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro ...@@ -111,4 +111,4 @@ public class DefaultPropertiesEnvironmentPostProcessor extends LoggerAwareEnviro
return ClassUtils.isPresent("org.apache.dubbo.config.bootstrap.DubboBootstrap", getClass().getClassLoader()); return ClassUtils.isPresent("org.apache.dubbo.config.bootstrap.DubboBootstrap", getClass().getClassLoader());
} }
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment