aaa

Ansjer/urls.py

@@ -7,7 +7,8 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     EquipmentManager, LogManager, PermissionManager, OTAEquipment, shareUserPermission, UidSetController, \
     UserManger, CheckUserData, \
     UserController, CloudVod, OrderContrller, VodBucket, DetectController, DeviceShare, UserBrandController, \
-    StsOssController, UIDPreview, OssCrd, SysMsg, UidUser, EquipmentManagerV2, PushDeploy, AppSetController
+    StsOssController, UIDPreview, OssCrd, SysMsg, UidUser, EquipmentManagerV2, PushDeploy, AppSetController,\
+    ApplicationController
 
 urlpatterns = [
     url(r'^account/authcode$', UserController.authCodeView.as_view()),
@@ -179,9 +180,9 @@ urlpatterns = [
     url(r'^oalexa/discoveryuid', UserController.alexaUidView.as_view()),
 
     url(r'^appset/(?P<operation>.*)$', AppSetController.AppSetView.as_view()),
-    # url(r'^application/(?P<operation>.*)$', ApplicationController.ApplicationView.as_view()),
-    # url(r'^login/oauth/(?P<operation>.*)$', ApplicationController.AuthView.as_view()),
-    # url(r'^grant/code/(?P<operation>.*)$', ApplicationController.GrantCodeView.as_view()),
+    url(r'^application/(?P<operation>.*)$', ApplicationController.ApplicationView.as_view()),
+    url(r'^login/oauth/(?P<operation>.*)$', ApplicationController.AuthView.as_view()),
+    url(r'^grant/code/(?P<operation>.*)$', ApplicationController.GrantCodeView.as_view()),
 
     # app 设备消息模板
     # 路由加参数参考

Model/models.py

@@ -787,63 +787,63 @@ class AppSetModel(models.Model):
         verbose_name_plural = verbose_name
         ordering = ('-id',)
 
-# # 认证客户端类型表
-# class ApplicationModel(models.Model):
-#     CLIENT_TYPES = (
-#         ('confidential', 'confidential'),
-#         ('public', 'public'),
-#     )
-#     # authorization_code
-#     # 授权码模式(即先登录获取code, 再获取token)
-#     # password
-#     # 密码模式(将用户名, 密码传过去, 直接获取token)
-#     # client_credentials
-#     # 客户端模式(无用户, 用户向客户端注册, 然后客户端以自己的名义向’服务端’获取资源)
-#     # implicit
-#     # 简化模式(在redirect_uri
-#     # 的Hash传递token;
-#     # Auth客户端运行在浏览器中, 如JS, Flash)
-#     # refresh_token
-#     # 刷新access_token
-#     GRANT_TYPES = (
-#         ('authorization_code', "authorization_code"),
-#         ('password', "password"),
-#         ('client_credentials', "client_credentials"),
-#         ('implicit', "implicit"),
-#         ('refresh_token', "refresh_token"),
-#     )
-#     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_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)
-#     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)
-#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
-#
-#     class Meta:
-#         ordering = ('-add_time',)
-#         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)
-#     expire_time = models.IntegerField(verbose_name='过期时间', default=0)
-#     add_time = models.IntegerField(verbose_name='添加时间', default=0)
-#     update_time = models.IntegerField(verbose_name='更新时间', default=0)
-#
-#     # 输出的永远是本地时间输出的永远是本地时间
-#     def is_expired(self):
-#         return timezone.now() >= self.expire_time
-#
-#     class Meta:
-#         ordering = ('-add_time',)
-#         verbose_name = u'授权码表'
-#         db_table = 'oauth_grant_code'
+# 认证客户端类型表
+class ApplicationModel(models.Model):
+    CLIENT_TYPES = (
+        ('confidential', 'confidential'),
+        ('public', 'public'),
+    )
+    # authorization_code
+    # 授权码模式(即先登录获取code, 再获取token)
+    # password
+    # 密码模式(将用户名, 密码传过去, 直接获取token)
+    # client_credentials
+    # 客户端模式(无用户, 用户向客户端注册, 然后客户端以自己的名义向’服务端’获取资源)
+    # implicit
+    # 简化模式(在redirect_uri
+    # 的Hash传递token;
+    # Auth客户端运行在浏览器中, 如JS, Flash)
+    # refresh_token
+    # 刷新access_token
+    GRANT_TYPES = (
+        ('authorization_code', "authorization_code"),
+        ('password', "password"),
+        ('client_credentials', "client_credentials"),
+        ('implicit', "implicit"),
+        ('refresh_token', "refresh_token"),
+    )
+    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_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)
+    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)
+    update_time = models.IntegerField(verbose_name='更新时间', default=0)
+
+    class Meta:
+        ordering = ('-add_time',)
+        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)
+    expire_time = models.IntegerField(verbose_name='过期时间', default=0)
+    add_time = models.IntegerField(verbose_name='添加时间', default=0)
+    update_time = models.IntegerField(verbose_name='更新时间', default=0)
+
+    # 输出的永远是本地时间输出的永远是本地时间
+    def is_expired(self):
+        return timezone.now() >= self.expire_time
+
+    class Meta:
+        ordering = ('-add_time',)
+        verbose_name = u'授权码表'
+        db_table = 'oauth_grant_code'