diff --git a/pom.xml b/pom.xml
index c51fcd9f..9e9b0b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,14 @@
13.2.1
+
+
+ io.github.openfeign
+ feign-jackson
+ 13.2.1
+
+
+
org.lionsoul
ip2region
diff --git a/src/main/java/cn/lihongjie/coal/emDevice/DustClientConfiguration.java b/src/main/java/cn/lihongjie/coal/emDevice/DustClientConfiguration.java
index 32efacd6..dc25e995 100644
--- a/src/main/java/cn/lihongjie/coal/emDevice/DustClientConfiguration.java
+++ b/src/main/java/cn/lihongjie/coal/emDevice/DustClientConfiguration.java
@@ -2,7 +2,11 @@ package cn.lihongjie.coal.emDevice;
import cn.lihongjie.coal.emDevice.client.DustApi;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import feign.Feign;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
import lombok.extern.slf4j.Slf4j;
@@ -15,11 +19,16 @@ import org.springframework.context.annotation.Configuration;
@Autowired
DustConfig dustConfig;
+ @Autowired ObjectMapper objectMapper;
@Bean
DustApi dustApi(){
- DustApi target = Feign.builder().target(DustApi.class, dustConfig.getUrl());
+ DustApi target = Feign.builder()
+ .encoder(new JacksonEncoder(objectMapper))
+ .decoder(new JacksonDecoder(objectMapper))
+
+ .target(DustApi.class, dustConfig.getUrl());
log.info("dust api url: {}", dustConfig.getUrl());
return target;
}
diff --git a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java
index a88e796a..06412cb9 100644
--- a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java
+++ b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java
@@ -7,8 +7,6 @@ import lombok.Data;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Formula;
-import java.time.LocalDateTime;
-
@Data
public class CreateThirdAccountDto extends OrgCommonDto {
@@ -30,24 +28,10 @@ public class CreateThirdAccountDto extends OrgCommonDto {
@Comment("密码")
private String password;
- @Comment("token")
- private String token;
+
@Comment("token过期时间(分钟)")
private Long tokenExpireMinute;
- @Comment("token过期时间")
- private LocalDateTime tokenExpireTime;
- @Comment("token下次刷新时间")
- private LocalDateTime tokenNextRefreshTime;
-
- @Comment("token刷新时间")
- private LocalDateTime tokenRefreshTime;
-
- @Comment("token刷新次数")
- private Integer tokenRefreshCount;
-
- @Comment("token刷新错误信息")
- private String tokenRefreshError;
}
diff --git a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java
index 7a845d1e..dbf2a07b 100644
--- a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java
+++ b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java
@@ -7,8 +7,6 @@ import lombok.Data;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Formula;
-import java.time.LocalDateTime;
-
@Data
public class UpdateThirdAccountDto extends OrgCommonDto {
@Comment("账号类型")
@@ -29,24 +27,9 @@ public class UpdateThirdAccountDto extends OrgCommonDto {
@Comment("密码")
private String password;
- @Comment("token")
- private String token;
@Comment("token过期时间(分钟)")
private Long tokenExpireMinute;
- @Comment("token过期时间")
- private LocalDateTime tokenExpireTime;
- @Comment("token下次刷新时间")
- private LocalDateTime tokenNextRefreshTime;
-
- @Comment("token刷新时间")
- private LocalDateTime tokenRefreshTime;
-
- @Comment("token刷新次数")
- private Integer tokenRefreshCount;
-
- @Comment("token刷新错误信息")
- private String tokenRefreshError;
}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 1382953f..9e2cc6d0 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -325,3 +325,6 @@ aliyun:
code: oss-rg-china-mainland
endpoint : oss-rg-china-mainland.aliyuncs.com
internal-endpoint: 不支持
+dust:
+ url: "http://dust.0531yun.cn/"
+