提交基础版本

Ansjer/test/osssigput.py

@@ -25,7 +25,7 @@ http://test.dvema.com/cloudVod/getSts?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1N
 '''
 
 
-tokenss ={"arn": "acs:ram::1901342792446414:role/stsoss/P2WNGJRD2EHA5EU9111A", "Expiration": "2019-01-22T07:02:57Z", "expire": "3600", "SecurityToken": "CAIS9AJ1q6Ft5B2yfSjIr4nXCNzBnZtD5pulMFfHkFIhbvlGoYP/rjz2IHFIf3NhAe0bv/kzm2lX7/YYlr1LEaBjam7+QZFdzr0K3D7wOtOYkpRvBy7OZ9j3d1KIAjvXgeV+CoeQFaELE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W5CzZud3ERGEL3DOpEdD4qPBPBVJUW/ljQvdt6+b7maQ/+JaX9eXW0z9BMftYSD+lIImr25n/H/6zPdsYbcSCWROUiIjJbMKq9Vp5PjRCZF9oA4NwciYrVUZzG2uGdvH7oQzwD139G/Tf4sYfyoFoyljkx92OKmWUTq+RuSRiYc5gNBl5b0NLjDG9LfZZKlwWaT18G62SVp5jypvDLGYoZWYagAGxJJYnBHcZPAqwX3N5KHH0t9hpC7+2gABri7XCw+gg0SWUt6LfyeRy/AcOS1DDkhaCJpTRzLLFdzCjByCFZ9ywqkDbJ+WVVjs1eyOxJvWJ6Q/IX1fQ1TTdf8+jHLmVHpPXLgvzyZWyg2I5O/zh08/ztkQoLLEGNgqQWoWgL6Bspg==", "AccessKeyId": "STS.NJbCfupDbQYN2qvtRtbvjNFTL", "AccessKeySecret": "ZxEb3t564YSBaqCWAgUwqebuhdmPnbAKNdj6zwUjokh", "ip": "120.237.157.184", "bucket_name": "usvod1", "endpoint": "oss-us-west-1.aliyuncs.com", "code": 0, "storage": "P2WNGJRD2EHA5EU9111A/vod1/"}
+tokenss ={"storage":"VVDHCVBYDKFMJRWA111A/vod1/","SecurityToken":"CAIS9AJ1q6Ft5B2yfSjIr4vNf9GFg7Rt2LWgOkvL0TMBRMFhhKThmzz2IHFIf3NhAe0bv/kzm2lX7/YYlr1NdbNlbnLuXOdTwLF1yzyIOtOYkpRjAyHzaNj3d1KIAjvXgeV+CoeQFaELE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W8jHZud3ERGdvzzWtDcDl3v5BCS1DWYFjQvdt6+b7maQ/+JaX9eXW0z9BMftYSD+lIImr25n/H/6zPdsYbcSCWROUiIjJbMKq9Vp5PjRCZF9oA4NwciYrVUZzG2uGdvH7oQzwD139G/Tf4sYfyoFoyljkx92OKmWUTq+RuSRiYc5gNBl5b0NLjDG9LfZZKlwWaT18G62SVp5jypvDLGYoZWYagAFqWQxzeu3nYVPR51pf1gvTX5hCksi9Xu+9WUMqC2YXPy6iHPjKQ+4Al/IfMwb3WZ/uY60LHuATrQUn4oYgYm7sW6NkrveNtiH7bEvZgoVMEx1VDLoL1gk83cxbyoEi436VZFPtfkX+7zZM3U1kUBNHTF+PnA9vmpc2EmpVbwNvEA==","expire":"3600","code":0,"AccessKeySecret":"njEzCG2HcBKFEzLBm1VozanwHUGRFddYPbjf1MSty5a","ip":"120.237.157.184","arn":"acs:ram::1901342792446414:role/stsoss/VVDHCVBYDKFMJRWA111A","endpoint":"oss-cn-shenzhen.aliyuncs.com","bucket_name":"cnvod1","Expiration":"2019-01-25T07:50:39Z","AccessKeyId":"STS.NHx4k1nkLowK8mz53THNMkaJy"}
 # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
 
 # 使用临时token中的认证信息初始化StsAuth实例。
@@ -55,10 +55,10 @@ bucket = oss2.Bucket(auth, tokenss['endpoint'], tokenss['bucket_name'])
 # # 上传一个字符串。
 # bucket.delete_object('a-3.txt')
 # exit()
-patht=tokenss['storage']+'gsafd'
+patht=tokenss['storage']+'asfsdafsdafdsa'
 print(patht)
 print(endpoint)
-bucket.put_object(patht, b'asdf')
+print(bucket.put_object(patht, b'asdfasdfsadfdsafsdfdsaf'))
 # bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
 exit()
 res = bucket.get_object('1234.txt')

Controller/OTAEquipment.py

@@ -431,11 +431,11 @@ def showAllEquipmentVersion(userID, response):
 def getNewVerInterface(request):
     response = ResponseObject()
     if request.method == "POST":
-        request.encoding = 'utf-8'
         request_dict = request.POST
     elif request.method == "GET":
-        request.encoding = 'utf-8'
         request_dict = request.GET
+    else:
+        return response.json(404)
     code = request_dict.get('code', None)
     token = request_dict.get('token', None)
     lang = request_dict.get('lang', None)
@@ -456,7 +456,6 @@ def getNewVerInterface(request):
         equipment = equipmentValid[0]
         file_path = equipment.filePath
         # 检测ip进行替换
-        client_ip = CommonService.get_ip_address(request)
         url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path + '?time=' + str(time.time())
         return response.json(0, {
             'ver': ver,

README.md

@@ -1,18 +1,19 @@
-### 软件版本：V1.4.0.218-12-12
-多语言OTA功能
+### 软件版本：V1.5.0.2019-2-12
+    1,云存功能第二版测试完成，功能完善，bug修正，使用公司提供账号
+    2,新版本ota功能（主要未dvr）
+### 软件版本：V1.4.0.2018-12-12
 	1,云存基础架构(完成)
 	2,付款(完成)
 	3,签名(完成)
 	4,云存视频流存储设计并实现(完成)
+    5,多语言OTA功能
 
-### 软件版本：V1.1.1.218-9-12
-更新内容：
+### 软件版本：V1.1.1.2018-9-12
 	1,令牌加密方案使用jwt
 	2,重写response类，redis类
 	3,无用预定义变量，加快交互速度
 
-### 软件版本：V1.0.3.218-7-23
-更新内容：
+### 软件版本：V1.0.3.2018-7-23
     1.增加报警推送信息
     2.增加设备操作日志
     3.设备昵称支持emoji
@@ -22,7 +23,7 @@
     7.设备第一次添加为绑定人(其他人只能通过解绑，或者分享，或者通过密码添加获得，暂时未更新到正式)
     8.增加操作文档
     9.增加p2p定时发送邮件脚本
-### 软件版本：V1.0.1.218-5-15  
+### 软件版本：V1.0.1.2018-5-15  
 更新内容：
 超级管理员账号：
     1.用户管理下的反馈问题界面（分页，显示，编辑，删除），排序功能（反馈时间排序，状态排序，更新时间排序）