Skip to content

I
ioc_sixiang_license
Commit cf191ace authored by AfirSraftGarrier's avatar AfirSraftGarrier
Browse files
Options

上报错误方法改变

parent 799fad48
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 9 deletions
license/src/main/java/iot/sixiang/license/auth/AuthManager.java
View file @ cf191ace
......@@ -80,9 +80,14 @@ public class AuthManager {
log.info("in black...");
return false;
}
Apply apply = allApply.get(appId);
String theAppId = device.getAppId();
if (theAppId == null) {
log.info("no real valid appId...");
return false;
}
Apply apply = allApply.get(theAppId);
String appKey = apply.getAppKey();
String input = "app_id=" + appId + "&sn=" + sn;
String input = "app_id=" + theAppId + "&sn=" + sn;
String valSHA1 = HmacUtil.encrypt(input, appKey, HmacUtil.HMAC_SHA1).toUpperCase();
if (CommonUtil.toUpperCaseByEnglish(sign).equals(CommonUtil.toUpperCaseByEnglish(valSHA1))) {
return true;
......@@ -102,11 +107,6 @@ public class AuthManager {
return false;
}
DeviceVo device = deviceManager.getDevice(sn);
String tempAppId = device.getAppId();
if (!appId.equals(tempAppId)) {
log.info("appId and sn no matching ...");
return false;
}
// 未绑定
if (device.getSnBind() == null) {
log.info("bind sn null...");
......@@ -117,9 +117,14 @@ public class AuthManager {
log.info("in black...");
return false;
}
Apply apply = allApply.get(appId);
String theAppId = device.getAppId();
if (theAppId == null) {
log.info("no real valid appId...");
return false;
}
Apply apply = allApply.get(theAppId);
String appKey = apply.getAppKey();
String input = "app_id=" + appId + "&sn=" + sn + "&sn_bind=" + device.getSnBind();
String input = "app_id=" + theAppId + "&sn=" + sn + "&sn_bind=" + device.getSnBind();
String valSHA1 = HmacUtil.encrypt(input, appKey, HmacUtil.HMAC_SHA1).toUpperCase();
if (CommonUtil.toUpperCaseByEnglish(sign).equals(CommonUtil.toUpperCaseByEnglish(valSHA1))) {
return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment