Merge branch 'LocalWyp' into test

Model/models.py

@@ -454,7 +454,7 @@ class Equipment_Version(models.Model):
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
     lang = models.CharField(blank=True, default='en', max_length=32, verbose_name=u'ota包内置语言')
     mci = models.CharField(default='', blank=True, max_length=10, verbose_name='设备类型')
-    img = models.CharField(max_length=300,blank=True, default='', verbose_name=u'图片路径')
+    img = models.CharField(max_length=300, blank=True, default='', verbose_name=u'图片路径')
     max_ver = models.CharField(default='', max_length=16, verbose_name='最大版本号')
 
     def __str__(self):
@@ -478,7 +478,7 @@ class App_Info(models.Model):
     app_type = models.IntegerField(default=0, blank=True, verbose_name=u'app类型')  # ios 1,android 2
     add_time = models.DateTimeField(blank=True, null=True, verbose_name=u'加入时间', auto_now_add=True)
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
-    downloadLink = models.CharField(max_length=300,blank=True, default='', verbose_name='升级')
+    downloadLink = models.CharField(max_length=300, blank=True, default='', verbose_name='升级')
     img = models.CharField(default='', max_length=128, verbose_name='图片路径')
 
     def __str__(self):
@@ -614,7 +614,7 @@ class SysMsgModel(models.Model):
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
-    eventType = models.IntegerField(verbose_name='消息类型', default=0) # 默认系统消息类型,0系统消息，1 ipcamera消息
+    eventType = models.IntegerField(verbose_name='消息类型', default=0)  # 默认系统消息类型,0系统消息，1 ipcamera消息
     uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
 
     class Meta:
@@ -643,11 +643,12 @@ class UidSetModel(models.Model):
     nickname = models.CharField(default='', max_length=64, verbose_name='设备昵称')
     ip = models.CharField(max_length=20, default='', verbose_name=u'设备ip')
     # 设备重置后第一次启动时间
-    is_alexa = models.IntegerField(default=0, verbose_name='是否支持alexa') # 0为不支持，1为支持，2为开启alexa发现
-    detect_group = models.CharField(default='',max_length=32,verbose_name=u'检测类型')
+    is_alexa = models.IntegerField(default=0, verbose_name='是否支持alexa')  # 0为不支持，1为支持，2为开启alexa发现
+    detect_group = models.CharField(default='', max_length=32, verbose_name=u'检测类型')
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
     resetTime = models.IntegerField(default=0, verbose_name='设备重置时间')
     region_alexa = models.CharField(max_length=8, verbose_name='设备alexa区域', default='ALL')  # ALL CN EU US
+
     class Meta:
         db_table = 'uid_set'
         verbose_name = u'设备配置表'
@@ -773,10 +774,9 @@ class pushDeployModel(models.Model):
         ordering = ('-id',)
 
 
-
 class AppSetModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键自增id')
-    appBundleId = models.CharField(max_length=64,default='', verbose_name=u'APPid')
+    appBundleId = models.CharField(max_length=64, default='', verbose_name=u'APPid')
     content = models.TextField(default='', verbose_name=u'里面包含评分，用户帮助，ap添加方式，ap工具，广告模块等json字段值')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='修改时间', default=0)
@@ -787,6 +787,7 @@ class AppSetModel(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('-id',)
 
+
 # 认证客户端类型表
 class ApplicationModel(models.Model):
     CLIENT_TYPES = (
@@ -815,9 +816,9 @@ class ApplicationModel(models.Model):
     id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=128, blank=True, verbose_name='client名字描述')
     client_id = models.CharField(max_length=50, unique=True, verbose_name='客户端id')
-    client_secret = models.CharField(max_length=50, unique=True,verbose_name='客户端secret')
+    client_secret = models.CharField(max_length=50, unique=True, verbose_name='客户端secret')
     client_type = models.CharField(max_length=32, choices=CLIENT_TYPES, verbose_name='客户端类型')
-    grant_type = models.CharField(max_length=32, choices=GRANT_TYPES,blank=True,null=True)
+    grant_type = models.CharField(max_length=32, choices=GRANT_TYPES, blank=True, null=True)
     redirect_uri = models.TextField(blank=True, null=True, verbose_name='重定向url')
     skip_auth = models.BooleanField(default=False, verbose_name='是否跳过点击授权')
     add_time = models.IntegerField(verbose_name='添加时间', default=0)
@@ -828,13 +829,14 @@ class ApplicationModel(models.Model):
         verbose_name = u'可授权客户端表'
         db_table = 'oauth_application'
 
+
 # 授权码信息表
 class GrantCodeModel(models.Model):
     id = models.BigAutoField(primary_key=True)
     userID = models.ForeignKey(Device_User, verbose_name="用户表userID", to_field='userID', on_delete=models.CASCADE)
     code = models.CharField(max_length=32, unique=True)
-    app_id = models.CharField(max_length=100, default='',verbose_name="appBundleId")
-    application = models.ForeignKey(ApplicationModel,verbose_name="用户表id", to_field='id', on_delete=models.CASCADE)
+    app_id = models.CharField(max_length=100, default='', verbose_name="appBundleId")
+    application = models.ForeignKey(ApplicationModel, verbose_name="用户表id", to_field='id', on_delete=models.CASCADE)
     expire_time = models.IntegerField(verbose_name='过期时间', default=0)
     add_time = models.IntegerField(verbose_name='添加时间', default=0)
     update_time = models.IntegerField(verbose_name='更新时间', default=0)
@@ -846,4 +848,110 @@ class GrantCodeModel(models.Model):
     class Meta:
         ordering = ('-add_time',)
         verbose_name = u'授权码表'
-        db_table = 'oauth_grant_code'
+        db_table = 'oauth_grant_code'
+
+
+'''
+    参数	            类型	    必有	描述
+    commodityName	String	是	云存储套餐名称
+    commodityCode	String	是	云存储套餐code
+    specification	String	是	云存储套餐规格
+    type	        int	    是	云存储套餐类型：1表示连续型；2表示事件型
+    price	        String	是	云存储套餐价格，单位元
+    lifecycle	    int	    是	存储周期，单位天
+    months	        int	    是	服务周期，单位月
+    description	    String	否	云存储套餐描述
+    icon	        String	否	云存储套餐图标url
+'''
+
+
+# class CloudStorageModel(models.Model):
+#     id = models.AutoField(primary_key=True, verbose_name=u'自增ID')
+#     commodityName = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐名称')
+#     commodityCode = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐code')
+#     specification = models.CharField(blank=True, max_length=32, verbose_name=u'云存储套餐规格')
+#     type = models.IntegerField(default=1, verbose_name='云存储套餐类型')  # 1表示连续型；2表示事件型
+#     currency = models.CharField(default='USD', max_length=8, verbose_name=u'货币')
+#     price = models.CharField(default=0, max_length=32, verbose_name=u'价格')
+#     lifecycle = models.IntegerField(default=0, verbose_name='存储周期')
+#     description = models.CharField(default='', max_length=128, verbose_name='云存储套餐描述')
+#     add_time = models.IntegerField(verbose_name='添加时间', default=0)
+#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
+#
+#     def __str__(self):
+#         return self.id
+#
+#     class Meta:
+#         db_table = 'cloud_storage'
+#         verbose_name = u'aws云存储套餐'
+#         verbose_name_plural = verbose_name
+#         ordering = ('id',)
+#
+#
+# '''
+# 参数	            类型	   必有	 描述
+# orderId	        String	是	订单id
+# commodityCode	String	是	云存储套餐code
+# specification	String	是	云存储套餐规格
+# copies	        int	    是	购买数量
+# startTime	    String	是	开始时间，格式yyyy-MM-dd HH:mm:ss
+# endTime	        String	是	结束时间，格式yyyy-MM-dd HH:mm:ss
+# expired	        int	    是	是否到期
+# paymentStatus	int	    是	支付状态1：已支付 0：未支付
+# price	        String	是	订单价格
+# commodityType	int	    是	云存储套餐类型1：连续型 2：事件型
+# startTimeUTC	String	是	开始时间（UTC），格式yyyy-MM-ddTHH:mm:ssZ
+# endTimeUTC	    String	是	结束时间（UTC），格式yyyy-MM-ddTHH:mm:ssZ
+# '''
+#
+#
+# class OrderModel(models.Model):
+#     orderID = models.CharField(max_length=20, primary_key=True, verbose_name="订单id")  # 主键
+#     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
+#     specification = models.CharField(max_length=32, default='', verbose_name='云存储套餐规格')
+#     copies = models.IntegerField(verbose_name='购买数量')
+#
+#     paymentStatus = models.SmallIntegerField(default=0, verbose_name='支付状态')  # 1已支付，0未支付
+#     price = models.CharField(max_length=32, default='', verbose_name='订单价格')
+#     currency = models.CharField(blank=True, default='USD', max_length=32, verbose_name=u'货币')
+#     commodityType = models.SmallIntegerField(default=1, verbose_name='云存储套餐类型')
+#     UID = models.CharField(max_length=20, verbose_name='设备UID')
+#     add_time = models.IntegerField(verbose_name='添加时间', default=0)
+#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
+#
+#     def __str__(self):
+#         return self.orderID
+#
+#     class Meta:
+#         db_table = 'orders'
+#         verbose_name = u'订单信息表'
+#         verbose_name_plural = verbose_name
+#         ordering = ('-orderID',)
+#
+#
+# class Order_Model(models.Model):
+#     orderID = models.CharField(blank=True, max_length=20, primary_key=True, verbose_name=u'订单id')
+#     # 订单关联用户
+#     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
+#     UID = models.CharField(max_length=20, verbose_name='设备UID')
+#     channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
+#     desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
+#     price = models.CharField(default='', max_length=16, verbose_name='价格')
+#     currency = models.CharField(blank=True, default='USD', max_length=32, verbose_name=u'货币')
+#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
+#     updTime = models.IntegerField(verbose_name='更新时间', default=0)
+#     endTime = models.IntegerField(verbose_name='结束时间', default=0)
+#     status = models.SmallIntegerField(default=0, verbose_name='付款状态')  # 0:否，1：成功
+#     # 订单关联套餐
+#     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')
+#     paypal = models.CharField(max_length=150, default='', verbose_name='paypal付款url')
+#     payType = models.SmallIntegerField(default=0, verbose_name='付款类型0:paypal,1:alipay')
+#
+#     def __str__(self):
+#         return self.orderID
+#
+#     class Meta:
+#         db_table = 'orders'
+#         verbose_name = u'订单信息表'
+#         verbose_name_plural = verbose_name
+#         ordering = ('-orderID',)