Compare commits
2
Commits
3bacf90940
...
988a0c0dc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
988a0c0dc1
|
||
|
|
44ea9b114d
|
+2
-2
@@ -16,10 +16,10 @@
|
|||||||
# ProjectName mingli-utils
|
# ProjectName mingli-utils
|
||||||
# ModuleName mingli-utils
|
# ModuleName mingli-utils
|
||||||
# CurrentFile gradle.properties
|
# CurrentFile gradle.properties
|
||||||
# LastUpdate 2026-11-17 09:07:20
|
# LastUpdate 2026-11-18 00:03:30
|
||||||
# UpdateUser MingLiPro
|
# UpdateUser MingLiPro
|
||||||
#
|
#
|
||||||
JDKVERSIONS=17
|
JDKVERSIONS=17
|
||||||
GROUPSID=com.mingliqiye.utils
|
GROUPSID=com.mingliqiye.utils
|
||||||
ARTIFACTID=mingli-utils
|
ARTIFACTID=mingli-utils
|
||||||
VERSIONS=5.5.2
|
VERSIONS=5.5.3
|
||||||
|
|||||||
@@ -16,14 +16,14 @@
|
|||||||
* ProjectName mingli-utils
|
* ProjectName mingli-utils
|
||||||
* ModuleName mingli-utils.main
|
* ModuleName mingli-utils.main
|
||||||
* CurrentFile DateTimeJsonConverter.kt
|
* CurrentFile DateTimeJsonConverter.kt
|
||||||
* LastUpdate 2026-11-17 20:17:32
|
* LastUpdate 2026-11-18 00:03:07
|
||||||
* UpdateUser MingLiPro
|
* UpdateUser MingLiPro
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.mingliqiye.utils.json.converters
|
package com.mingliqiye.utils.json.converters
|
||||||
|
|
||||||
import com.google.gson.JsonParseException
|
|
||||||
import com.mingliqiye.utils.annotation.DateTimeJsonFormat
|
import com.mingliqiye.utils.annotation.DateTimeJsonFormat
|
||||||
|
import com.mingliqiye.utils.exception.JsonParserException
|
||||||
import com.mingliqiye.utils.json.api.type.JsonTypeReference
|
import com.mingliqiye.utils.json.api.type.JsonTypeReference
|
||||||
import com.mingliqiye.utils.json.converters.base.AnnotationGetter
|
import com.mingliqiye.utils.json.converters.base.AnnotationGetter
|
||||||
import com.mingliqiye.utils.json.converters.base.BaseJsonConverter
|
import com.mingliqiye.utils.json.converters.base.BaseJsonConverter
|
||||||
@@ -68,12 +68,12 @@ class DateTimeJsonConverter : BaseJsonConverter<DateTime> {
|
|||||||
/**
|
/**
|
||||||
* 按 [DateTimeJsonFormat] 注解指定的格式从 JSON 字符串解析日期时间
|
* 按 [DateTimeJsonFormat] 注解指定的格式从 JSON 字符串解析日期时间
|
||||||
*
|
*
|
||||||
* @throws JsonParseException 当节点不是字符串类型时抛出
|
* @throws JsonParserException 当节点不是字符串类型时抛出
|
||||||
*/
|
*/
|
||||||
override fun deConvert(jsonReader: BaseJsonReader, annotationGetter: AnnotationGetter): DateTime? {
|
override fun deConvert(jsonReader: BaseJsonReader, annotationGetter: AnnotationGetter): DateTime? {
|
||||||
val dateTimeJsonFormat: DateTimeJsonFormat? = annotationGetter.getAnnotation<DateTimeJsonFormat>()
|
val dateTimeJsonFormat: DateTimeJsonFormat? = annotationGetter.getAnnotation<DateTimeJsonFormat>()
|
||||||
if (jsonReader.isNull) return null
|
if (jsonReader.isNull) return null
|
||||||
if (!jsonReader.isString) throw JsonParseException("type item not string")
|
if (!jsonReader.isString) throw JsonParserException("type item not string")
|
||||||
val obj = jsonReader.getString()
|
val obj = jsonReader.getString()
|
||||||
return if (Formatter.NONE != dateTimeJsonFormat?.value && dateTimeJsonFormat != null) {
|
return if (Formatter.NONE != dateTimeJsonFormat?.value && dateTimeJsonFormat != null) {
|
||||||
DateTime.parse(obj, dateTimeJsonFormat.value, dateTimeJsonFormat.repcZero)
|
DateTime.parse(obj, dateTimeJsonFormat.value, dateTimeJsonFormat.repcZero)
|
||||||
|
|||||||
+2
-2
@@ -16,7 +16,7 @@
|
|||||||
* ProjectName mingli-utils
|
* ProjectName mingli-utils
|
||||||
* ModuleName mingli-utils.main
|
* ModuleName mingli-utils.main
|
||||||
* CurrentFile NetworkEndpointJsonConverter.kt
|
* CurrentFile NetworkEndpointJsonConverter.kt
|
||||||
* LastUpdate 2026-11-18 00:01:29
|
* LastUpdate 2026-11-18 00:03:17
|
||||||
* UpdateUser MingLiPro
|
* UpdateUser MingLiPro
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ class NetworkEndpointJsonConverter : BaseJsonConverter<NetworkEndpoint> {
|
|||||||
/**
|
/**
|
||||||
* 从 `host:port` 形式的 JSON 字符串还原网络端点
|
* 从 `host:port` 形式的 JSON 字符串还原网络端点
|
||||||
*
|
*
|
||||||
* @throws JsonParseException 当节点不是字符串类型时抛出
|
* @throws JsonParserException 当节点不是字符串类型时抛出
|
||||||
*/
|
*/
|
||||||
override fun deConvert(
|
override fun deConvert(
|
||||||
jsonReader: BaseJsonReader,
|
jsonReader: BaseJsonReader,
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
* ProjectName mingli-utils
|
* ProjectName mingli-utils
|
||||||
* ModuleName mingli-utils.main
|
* ModuleName mingli-utils.main
|
||||||
* CurrentFile UUIDJsonConverter.kt
|
* CurrentFile UUIDJsonConverter.kt
|
||||||
* LastUpdate 2026-11-18 00:02:04
|
* LastUpdate 2026-11-18 00:03:17
|
||||||
* UpdateUser MingLiPro
|
* UpdateUser MingLiPro
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ class UUIDJsonConverter : BaseJsonConverter<UUID> {
|
|||||||
/**
|
/**
|
||||||
* 按 [UUIDJsonFormat] 注解指定的进制从 JSON 字符串解析 UUID
|
* 按 [UUIDJsonFormat] 注解指定的进制从 JSON 字符串解析 UUID
|
||||||
*
|
*
|
||||||
* @throws JsonParseException 当节点不是字符串类型时抛出
|
* @throws JsonParserException 当节点不是字符串类型时抛出
|
||||||
*/
|
*/
|
||||||
override fun deConvert(
|
override fun deConvert(
|
||||||
jsonReader: BaseJsonReader,
|
jsonReader: BaseJsonReader,
|
||||||
|
|||||||
Reference in New Issue
Block a user