chenjunkai 5 years ago
parent
commit
2313eee654
3 changed files with 14 additions and 2 deletions
  1. 3 0
      Ansjer/test/kbt.py
  2. 1 1
      Controller/EquipmentStatus.py
  3. 10 1
      Model/models.py

+ 3 - 0
Ansjer/test/kbt.py

@@ -0,0 +1,3 @@
+import requests
+ss = requests.put('https://statres.oss-cn-hongkong.aliyuncs.com/log%2FPVKWF95KGSV3A9G9111A1571041637.log?OSSAccessKeyId=LTAIyMkGfEdogyL9&Signature=Q90obbnivosYDCs9qJqqfa00HQU%3D&Expires=1571048837',data='13241342134314')
+print(ss.status_code)

+ 1 - 1
Controller/EquipmentStatus.py

@@ -149,7 +149,7 @@ def getUploadLogUrl(request):
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         nowTime = int(time.time())
-        obj = 'log/{uid}'.format(uid=uid) + str(nowTime) + '.log'
+        obj = 'log/{uid}/'.format(uid=uid) + str(nowTime) + '.log'
         url = bucket.sign_url('PUT', obj, 7200)
         url = bucket.sign_url('PUT', obj, 7200)
         return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'url': url})
         return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'url': url})
     else:
     else:

+ 10 - 1
Model/models.py

@@ -643,7 +643,7 @@ class UID_Preview(models.Model):
 class SysMsgModel(models.Model):
 class SysMsgModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 用户信息
     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 用户信息
-    msg = models.TextField(blank=True, default='', verbose_name=u'更新内容')
+    msg = models.TextField(blank=True, default='', verbose_name=u'发送内容')
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
@@ -718,3 +718,12 @@ class UserExtendModel(models.Model):
         verbose_name = '用户扩展信息表'
         verbose_name = '用户扩展信息表'
         verbose_name_plural = verbose_name
         verbose_name_plural = verbose_name
         ordering = ('-id',)
         ordering = ('-id',)
+#
+#
+# class SysMass(models.Model):
+#     id = models.AutoField(primary_key=True, verbose_name='主键自增id')
+#     sender = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 发送人
+#     recever = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)  # 发送接受者
+#     msg = models.TextField(blank=True, default='', verbose_name=u'发送内容')
+#     addTime = models.IntegerField(verbose_name='添加时间', default=0)
+#     updTime = models.IntegerField(verbose_name='修改时间', default=0)