Browse Source

更新绑定uid时,返回CRCKey值

lang 4 năm trước cách đây
mục cha
commit
3a1e32b954
2 tập tin đã thay đổi với 13 bổ sung2 xóa
  1. 3 0
      Ansjer/config.py
  2. 10 2
      Controller/SerialNumberController.py

+ 3 - 0
Ansjer/config.py

@@ -75,6 +75,9 @@ AWS_ACCESS_KEY_ID = ['AKIA2MMWBR4DSFG67DTG','AKIA2E67UIMD45Y3HL53']  #0国内,
 AWS_SECRET_ACCESS_KEY = ['aI9gxcAKPmiGgPy9axrtFKzjYGbvpuytEX4xWweL','ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw']
 AWS_ARN = ['arn:aws-cn:s3','arn:aws:s3']
 
+#尚云服务器CRCKey
+CRCKey = {'AUS':'CRCKey'}   #{平台名:CRCKey值}
+
 # 不同环境配置
 #美国
 if SERVER_TYPE == 'Ansjer.us_config.local_settings':

+ 10 - 2
Controller/SerialNumberController.py

@@ -16,6 +16,7 @@ from Object.uidManageResponseObject import uidManageResponseObject
 from Object.TokenObject import TokenObject
 from Service.AlgorithmService import AlgorithmBaseOn35
 from Service.CommonService import CommonService
+from Ansjer.config import CRCKey
 from Service.ModelService import ModelService
 
 
@@ -254,8 +255,12 @@ class SerialNumberView(View):
                                 if dev.exists():
                                     dev.update(serial_number=serial_number)
 
+                                full_uid_code = uid.uid__full_uid_code
+                                if uid.platform in CRCKey.keys():
+                                    full_uid_code += ':'+CRCKey[uid.platform]
+
                                 res = {
-                                    'full_uid_code': CommonService.encode_data(uid.full_uid_code),
+                                    'full_uid_code': CommonService.encode_data(full_uid_code),
                                     'uid': CommonService.encode_data(uid.uid),
                                     'mac': CommonService.encode_data(uid.mac),
                                     'extra': uid.uid_extra,
@@ -273,8 +278,11 @@ class SerialNumberView(View):
                         if uid_qs.exists():
                             uid = uid_qs.values('uid__uid', 'uid__mac', 'uid__uid_extra', 'uid__full_uid_code',
                                                 'uid__platform', 'uid__init_string', 'uid__init_string_app')[0]
+                            full_uid_code = uid['uid__full_uid_code']
+                            if uid['uid__platform'] in CRCKey.keys():
+                                full_uid_code += ':'+CRCKey[uid['uid__platform']]
                             res = {
-                                'full_uid_code': CommonService.encode_data(uid['uid__full_uid_code']),
+                                'full_uid_code': CommonService.encode_data(full_uid_code),
                                 'uid': CommonService.encode_data(uid['uid__uid']),
                                 'mac': CommonService.encode_data(uid['uid__mac']),
                                 'extra': uid['uid__uid_extra'],