删除base64obj

Controller/EquipmentOTA.py

@@ -14,7 +14,6 @@ from Object.TokenObject import TokenObject
 from Object.UrlTokenObject import UrlTokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-from Object.base64Object import base64Object
 
 '''
 http://192.168.136.45:8077/equipment/OTA?token=test&operation=query&page=1&line=10
@@ -231,9 +230,6 @@ class EquipmentVersionView(View):
         file_path = eqs[0].filePath
         if file_path.find('static/Upgrade/') != -1:
             path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
-            # base64Object加密
-            # path = base64Object.generate_token(key="ansjer/"+CommonService.RandomStr(6) +"/"+path)
-
             # 创建url的token
             tko = UrlTokenObject()
             path = tko.generate(data={'Url': "ansjer/"+CommonService.RandomStr(6) +"/"+ file_path})
@@ -241,9 +237,6 @@ class EquipmentVersionView(View):
             url = SERVER_DOMAIN + 'OTA/downloads/' + path
         elif file_path.find('static/otapack') != -1:
             file_path = file_path
-            # base64Object加密
-            # file_path = base64Object.generate_token(key= "ansjer/"+CommonService.RandomStr(6) +"/"+ file_path)
-
             # 创建url的token
             tko = UrlTokenObject()
             file_path = tko.generate(data={'Url': "ansjer/"+CommonService.RandomStr(6) +"/"+ file_path})
@@ -251,6 +244,7 @@ class EquipmentVersionView(View):
             url = SERVER_DOMAIN + 'dlotapack/' +file_path
         else:
             return response.json(900, '2')
+        # http: // 192.168.136.39:8000 / EquipmentVersion / checkVer?code = 20D20410010
 
 
         res = {

Controller/OTAEquipment.py

@@ -1,5 +1,4 @@
-import base64
-from Object.base64Object import base64Object
+
 from zlib import crc32
 from django.core import serializers
 from wsgiref.util import FileWrapper
@@ -571,18 +570,6 @@ def downloadOTAInterfaceV2(request, fullPath, *callback_args, **callback_kwargs)
     res = ResponseObject()
     print('fullPath:')
     print(fullPath)
-    # 解密base64的url的值
-    # try:
-    #     fp = base64Object.get_certify_token(token=fullPath+'==')
-    #     print("解密结果：", fp)
-    #     user_de = base64Object.certify_token(key=fp, token=fullPath+'==')
-    #     if user_de:
-    #         print("验证结果：", user_de)
-    #     else:
-    #         return res.json(907)
-    # except Exception as e:
-    #     return res.json(906, repr(e))
-
     # 解密url的token
     url_token = UrlTokenObject(fullPath)
     if ( '' == url_token.Url):

Object/base64Object.py

@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-import hashlib
-
-# 待加密内容
-# strdata = "xiaojingjiaaseafe16516506ng"
-#
-# h1 = hashlib.md5()
-# h1.update(strdata.encode(encoding='utf-8'))
-#
-# strdata_tomd5 = h1.hexdigest()
-#
-# print("原始内容：", strdata, ",加密后：", strdata_tomd5)
-
-import time
-import base64
-
-class base64Object:
-    # 生产token
-    def generate_token(key, expire=300):
-        '''
-            @Args:
-                key: str (用户给定的key，需要用户保存以便之后验证token,每次产生token时的key 都可以是同一个key)
-                expire: int(最大有效时间，单位为s)
-            @Return:
-                state: str
-        '''
-        ts_str = str(time.time() + expire)
-        token = ts_str + ':' + key
-        b64_token = base64.urlsafe_b64encode(token.encode("utf-8"))
-        return b64_token.decode("utf-8")
-
-
-    # 解密token
-    def get_certify_token(token):
-        '''
-            @Args:
-                key: str
-                token: str
-            @Returns:
-                boolean
-        '''
-        token_str = base64.urlsafe_b64decode(token).decode('utf-8')
-        token_list = token_str.split(':')
-        if len(token_list) != 2:
-            return '长度不对'
-        known_sha1_tsstr = token_list[1]
-        return known_sha1_tsstr
-
-    # 验证token
-    def certify_token(key, token):
-        '''
-            @Args:
-                key: str
-                token: str
-            @Returns:
-                boolean
-        '''
-        token_str = base64.urlsafe_b64decode(token).decode('utf-8')
-        token_list = token_str.split(':')
-        if len(token_list) != 2:
-            return False
-        ts_str = token_list[0]
-        print (float(ts_str))
-        print (time.time())
-        print (float(ts_str) < time.time())
-        if float(ts_str) < time.time():
-            # token expired
-            return False
-
-        known_sha1_tsstr = token_list[1]
-        print (66666666666666)
-        print (known_sha1_tsstr != key)
-        if known_sha1_tsstr != key:
-            # token certification failed
-            return False
-        # token certification success
-        return True
-
-    #
-    # key = "xiaojingjing"
-    # print("key：", key)
-    # user_token = generate_token(key=key)
-    #
-    # print("加密后：", user_token)
-    # user_de = certify_token(key=key, token=user_token)
-    # print("验证结果：", user_de)
-    #
-    # key = "xiaoqingqing"
-    # user_de = certify_token(key=key, token=user_token)
-    # print("验证结果：",user_de)