From 8c5435101924d68588448a4c981417df4b4dab1d Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 21 Feb 2025 11:08:20 +0800
Subject: [PATCH] 整合websocket 统一使用按类型区分
---
ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java b/ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java
index d93dfe2..5d97f9c 100644
--- a/ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java
+++ b/ard-work/src/main/java/com/ard/tianyu/config/TyConfiguration.java
@@ -3,17 +3,14 @@
import com.ard.tianyu.http.TyClient;
import com.ard.tianyu.model.dto.TokenDTO;
import com.ard.tianyu.model.receiver.AccessTokenReceiver;
-import com.ard.tianyu.model.receiver.BoxReceiver;
import com.ard.tianyu.model.receiver.TyHttpCommonReceiver;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.DigestUtils;
-
import javax.annotation.Resource;
import java.util.Date;
-import java.util.List;
/**
* TianyuConfiguration
@@ -33,24 +30,29 @@
private String accesskeysecret;
+ private String tcpserver;
+
+ private Integer tcpport;
private long timestamp;
- public long getTimeStamp()
- {
+
+ public long getTimeStamp() {
timestamp = new Date().getTime();
return timestamp;
}
+
private String encryptstr;
- public String getEncryptStr()
- {
- String sb = new StringBuilder()
- .append(accesskeyid)
- .append(accesskeysecret)
- .append(getTimeStamp())
- .toString();
+ public String getEncryptStr() {
+ String sb = accesskeyid +
+ accesskeysecret +
+ getTimeStamp();
encryptstr = DigestUtils.md5DigestAsHex(sb.getBytes());
return encryptstr;
+ }
+
+ public String getIpPort() {
+ return tcpserver + ":" + tcpport;
}
@Resource
@@ -59,7 +61,7 @@
private AccessTokenReceiver accessToken;
public AccessTokenReceiver getAccessToken() {
- if(accessToken != null)
+ if (accessToken != null)
return accessToken;
// 准备请求的json
TokenDTO gtd = TokenDTO.builder()
@@ -67,10 +69,13 @@
.encryptStr(getEncryptStr())
.timeStamp(timestamp)
.build();
- TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(gtd);
+ try {
+ TyHttpCommonReceiver<AccessTokenReceiver> getTokenRes = tyClient.getToken(gtd);
+ accessToken = getTokenRes.getContent();
+ } catch (Exception e) {
+ log.error("获取token失败:{}", e.getMessage());
+ }
//{"state":0,"content":{"companyId":4127,"accessToken":"sOONT0MMVdoKcMBibb40xxgrUrq0Hw9RFiajic3KOzoNtk"}}
- accessToken = getTokenRes.getContent();
return accessToken;
}
-
}
--
Gitblit v1.9.3