fix(#1272): 1、sign is null fix 2、code reformat

pull/1360/head
yujianbo 2 years ago
parent 07ea4a2411
commit f636b80037

@ -88,12 +88,18 @@ public class LarkSendMessageHandler implements SendMessageHandler {
larkAlarmTxt = StringUtil.replace(larkAlarmTxt, larkAlarmTimeoutReplaceJson, ""); larkAlarmTxt = StringUtil.replace(larkAlarmTxt, larkAlarmTimeoutReplaceJson, "");
} }
String timestamp=String.valueOf(System.currentTimeMillis()).substring(0,10);; String timestamp = String.valueOf(System.currentTimeMillis()).substring(0, 10);
String sign = genSign(notifyConfig.getSecret(), timestamp); String signKey = "";
String signVal = "";
if (notifyConfig.getSecret() != null) {
signVal = genSign(notifyConfig.getSecret(), timestamp);
signKey = "sign";
}
String text = String.format(larkAlarmTxt, String text = String.format(larkAlarmTxt,
timestamp, timestamp,
sign, signKey,
signVal,
alarmNotifyRequest.getActive(), alarmNotifyRequest.getActive(),
alarmNotifyRequest.getNotifyTypeEnum(), alarmNotifyRequest.getNotifyTypeEnum(),
alarmNotifyRequest.getThreadPoolId(), alarmNotifyRequest.getThreadPoolId(),
@ -166,25 +172,14 @@ public class LarkSendMessageHandler implements SendMessageHandler {
} }
} }
private String verifySign(String secret, long timestamp) throws Exception {
//把timestamp+"\n"+密钥当做签名字符串
String stringToSign = timestamp + "\n" + secret;
//使用HmacSHA256算法计算签名
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(stringToSign.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
byte[] signData = mac.doFinal(new byte[]{});
return new String(Base64.encodeBase64(signData));
}
/** /**
* generate Signature * generate Signature
*/ */
private String genSign(String secret, String timestamp) throws NoSuchAlgorithmException, InvalidKeyException { private String genSign(String secret, String timestamp) throws NoSuchAlgorithmException, InvalidKeyException {
//把timestamp+"\n"+密钥当做签名字符串 // geneSign
String stringToSign = timestamp + "\n" + secret; String stringToSign = timestamp + "\n" + secret;
//使用HmacSHA256算法计算签名 // encode
Mac mac = Mac.getInstance("HmacSHA256"); Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(stringToSign.getBytes(StandardCharsets.UTF_8), "HmacSHA256")); mac.init(new SecretKeySpec(stringToSign.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
byte[] signData = mac.doFinal(new byte[]{}); byte[] signData = mac.doFinal(new byte[]{});

@ -1,7 +1,7 @@
{ {
"msg_type": "interactive", "msg_type": "interactive",
"timestamp":"%s", "timestamp":"%s",
"sign": "%s", "%s":"%s",
"card": { "card": {
"config": { "config": {
"wide_screen_mode": true "wide_screen_mode": true

Loading…
Cancel
Save