From ce6661c206dc61da7ed8d41fa645cf3c6686607b Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 30 May 2023 08:36:34 +0800 Subject: [PATCH] update --- .../src/test/java/SpringBootTestController.java | 14 +++++++------- .../lianlian/service/impl/LianLianServiceImpl.java | 6 +++--- .../thirdparty/lianlian/vo/AccessTokenVO.java | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 93de41e1e..83695399b 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -270,13 +270,13 @@ public class SpringBootTestController { // Map map = lianLianService.generateToken(dto); // String data1 = map.get("Data"); // // 解密data - String data1 = "JudlP17tnYuQc2zwOzmjJAb9hgghIymefG5v3ZzSOlOzRL6QcXMa5C5dy8acL2ZWEw5DOc0D3G2qSLsqBCZ9ft/8akGVLL0N4keLV9ipS2REJx1dvm1m4l9ONIP9czNeDTxUsS0b1aCkkxgn7OVYD+ch+yLH/3dMATb32aEjggGY31lu/S2vB+f2aO+icJ2EyAkakB8Huowb3ancZVs/sxCFbVZUmUyo6WEyLtfcn3moKwD52CWoECRgK7lUjBs3F8VKcMT/dTeSKEgZM3Z7/wrEzljKL4519XKyL2lYgJ3h/ewFDRZcnTIJAWskfiKnacZF7yZUTYj13h+sI9wrYmgT2ScqDCQVUI40gDnpewU="; - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(data1), - operatorSecret.getBytes(), operatorSecret.getBytes()); - String dataStr = new String(plainText, "UTF-8"); - Map resultMap = (Map) JSON.parse(dataStr); - String token = resultMap.get("AccessToken"); - System.out.println("解密后token：" + token); + // String data1 = "JudlP17tnYuQc2zwOzmjJAb9hgghIymefG5v3ZzSOlOzRL6QcXMa5C5dy8acL2ZWEw5DOc0D3G2qSLsqBCZ9ft/8akGVLL0N4keLV9ipS2REJx1dvm1m4l9ONIP9czNeDTxUsS0b1aCkkxgn7OVYD+ch+yLH/3dMATb32aEjggGY31lu/S2vB+f2aO+icJ2EyAkakB8Huowb3ancZVs/sxCFbVZUmUyo6WEyLtfcn3moKwD52CWoECRgK7lUjBs3F8VKcMT/dTeSKEgZM3Z7/wrEzljKL4519XKyL2lYgJ3h/ewFDRZcnTIJAWskfiKnacZF7yZUTYj13h+sI9wrYmgT2ScqDCQVUI40gDnpewU="; + // byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(data1), + // operatorSecret.getBytes(), operatorSecret.getBytes()); + // String dataStr = new String(plainText, "UTF-8"); + // Map resultMap = (Map) JSON.parse(dataStr); + // String token = resultMap.get("AccessToken"); + // System.out.println("解密后token：" + token); // LianLianPushStationInfoDTO dto1 = LianLianPushStationInfoDTO.builder() diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index fe30a6209..bd9baa23d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -1319,9 +1319,9 @@ public class LianLianServiceImpl implements LianLianService { AccessTokenVO vo = new AccessTokenVO(); vo.setAccessToken(token); vo.setOperatorID(operatorID); - vo.setTokenAvailableTime(String.valueOf(ttlMillis / 1000)); - vo.setFailReason("0"); - vo.setSuccStat("0"); + vo.setTokenAvailableTime((int) (ttlMillis / 1000)); + vo.setFailReason(0); + vo.setSuccStat(0); Map resultMap = Maps.newLinkedHashMap(); // 加密数据 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/AccessTokenVO.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/AccessTokenVO.java index 0cf6ff566..4b89ca524 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/AccessTokenVO.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/vo/AccessTokenVO.java @@ -19,7 +19,7 @@ public class AccessTokenVO { * 1:失败 */ @JsonProperty(value = "SuccStat") - private String succStat; + private Integer succStat; /** * 字符串 全局唯一凭证 @@ -31,7 +31,7 @@ public class AccessTokenVO { * 整型 凭证有效期，单位秒 */ @JsonProperty(value = "TokenAvailableTime") - private String tokenAvailableTime; + private Integer tokenAvailableTime; /** * 整型 @@ -40,5 +40,5 @@ public class AccessTokenVO { * 2:密钥错误； 3～99:自定义 */ @JsonProperty(value = "FailReason") - private String failReason; + private Integer failReason; }