上报错误方法改变

license/src/main/java/iot/sixiang/license/auth/AuthManager.java

@@ -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;