remad

Controller/DeviceManage.py

@@ -46,27 +46,26 @@ class DeviceManage(View):
     def validation(self, request_dict, *args, **kwargs):
         operation = request_dict.get('operation', None)
         response = ResponseObject()
-        if operation is not None:
-            token = request_dict.get('token', None)
-            if token is not None:
-                tko = TokenObject(token)
-                response.lang = tko.lang
-                if tko.code == 0:
-                    userID = tko.userID
-                    if userID is not None:
-                        if operation == 'query':
-                            return self.query(request_dict, userID, response)
-                        elif operation == 'findByUser':
-                            return self.findByUser(request_dict, userID,response)
-                        elif operation == 'delete':
-                            return self.delete(request_dict, userID, response)
-                    return response.json(444,'operation')
-                else:
-                    return response.json(tko.code)
+        if not operation:
+            return response.json(444,'operation')
+        token = request_dict.get('token', None)
+        if token is not None:
+            tko = TokenObject(token)
+            response.lang = tko.lang
+            if tko.code == 0:
+                userID = tko.userID
+                if userID is not None:
+                    if operation == 'query':
+                        return self.query(request_dict, userID, response)
+                    elif operation == 'findByUser':
+                        return self.findByUser(request_dict, userID, response)
+                    elif operation == 'delete':
+                        return self.delete(request_dict, userID, response)
+                return response.json(444, 'operation')
             else:
-                return response.json(309)
+                return response.json(tko.code)
         else:
-            return response.json(444)
+            return response.json(309)
 
     def query(self, request_dict, userID, response):
         own_perm = ModelService.check_perm(userID=userID, permID=30)

Model/models.py

@@ -595,20 +595,3 @@ class UID_Bucket(models.Model):
 
     def __str__(self):
         return self.id
-
-# class UserStsModel(models.Model):
-#     id = models.AutoField(primary_key=True, verbose_name='主键')
-#     uid = models.CharField(max_length=20, verbose_name='设备UID')
-#     channel = models.SmallIntegerField(default=0, verbose_name='通道')
-#     data = models.TextField(verbose_name='设备sts')
-#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
-#     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id',on_delete=models.CASCADE, default=1, verbose_name='存储空间')
-#
-#     def __str__(self):
-#         return self.id
-#
-#     class Meta:
-#         db_table = 'vod_user_sts'
-#         verbose_name = u'用户证书'
-#         verbose_name_plural = verbose_name
-#         ordering = ('-id',)

Object/ResponseObject.py

@@ -2,11 +2,7 @@ from django.shortcuts import HttpResponse
 import simplejson as json
 
 
-# 后面尽量尽量使用这个JSON响应类，模板未Controller/OauthManage.py
-
-
 class ResponseObject(object):
-
     def __init__(self, lang='en'):
         self.lang = lang
 

README.md

@@ -1,6 +1,8 @@
 ### 软件版本：V1.4.0.218-12-12
 多语言OTA功能
-云存基础架构，付款，签名
+1,云存基础架构
+2,付款
+3,签名
 
 ### 软件版本：V1.1.1.218-9-12
 更新内容：