修复返回mac不正确问题,加解密函数判断传参

Controller/SerialNumberController.py

@@ -217,7 +217,7 @@ class SerialNumberView(View):
                         res = {
                             'full_uid_code': CommonService.encode_data(full_uid_code),
                             'uid': CommonService.encode_data(uid.uid),
-                            'mac': CommonService.encode_data(uid.mac),
+                            'mac': CommonService.encode_data(current_mac),
                             'extra': uid.uid_extra,
                             'platform': uid.platform,
                             'initString': uid.init_string,

Service/CommonService.py

@@ -385,6 +385,8 @@ class CommonService:
 
     @staticmethod
     def decode_data(content, start=1, end=4):
+        if not content:
+            return ''
         try:
             for i in range(start, end):
                 if i == 1:
@@ -408,6 +410,8 @@ class CommonService:
 
     @staticmethod
     def encode_data(content, start=1, end=4):
+        if not content:
+            return ''
         for i in range(start, end):
             if i == 1:
                 content = CommonService.RandomStr(3, False) + content + CommonService.RandomStr(3, False)