限制上传文件的大小

设置session过期时间
添加要求登录的限制

Author: 黄建生

WebIM/settings.py

@@ -24,9 +24,7 @@
 SECRET_KEY = '3zt8c)88lmp_8kif4&y*#oy=myhsdh5do)xjixb3$$b+i-2+vt'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
-# Domain = 'http://127.0.0.1:8000'
-Domain = 'https://iwantme.cn'
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
@@ -183,8 +181,30 @@ def mysql_settings():
 
 
 # 上传文件白名单
-ALLOWED_EXTENSIONS = ('txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif')
+ALLOWED_EXTENSIONS = ('txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif', 'zip')
+# 2.5MB - 2621440
+# 5MB - 5242880
+# 10MB - 10485760
+# 20MB - 20971520
+# 50MB - 5242880
+# 100MB 104857600
+# 250MB - 214958080
+# 500MB - 429916160
+MAX_UPLOAD_SIZE = 10485760
+
+# LOGIN_URL
+LOGIN_URL = '/'
+Domain = 'http://127.0.0.1:8000'
+# Domain = 'https://iwantme.cn'
+
+AUTH_USER_MODEL = 'chat.IMUser'
 
+# session 设置
+# 30分钟
+SESSION_COOKIE_AGE = 60 * 5
+SESSION_SAVE_EVERY_REQUEST = True
+# 关闭浏览器，则COOKIE失效
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 
 # 本地开发配置放在local_settings.py中
 # try:

chat/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from chat.models import User, GroupChat, Group, Message
+from chat.models import IMUser, IMGroupChat, IMGroup, Message
 
 
 class UserAdmin(admin.ModelAdmin):
@@ -18,9 +18,6 @@ class UserAdmin(admin.ModelAdmin):
 	)
 
 
-admin.site.register(User, UserAdmin)
-admin.site.register(Group)
-admin.site.register(GroupChat)
-# admin.site.register(Membership)
-# admin.site.register(Message)
-# admin.site.register(GroupChatMembership)
+admin.site.register(IMUser, UserAdmin)
+admin.site.register(IMGroup)
+admin.site.register(IMGroupChat)

chat/consumers.py

@@ -2,7 +2,7 @@
 from channels.generic.websocket import AsyncWebsocketConsumer
 from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
-from .models import Group
+from .models import IMGroup
 import json
 
 

chat/models.py

@@ -1,11 +1,12 @@
 import uuid
 import django
 from django.db import models
+from django.contrib.auth.models import AbstractUser
 
 
-class User(models.Model):
+class IMUser(AbstractUser):
 	id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-	username = models.CharField(max_length=100, verbose_name="用户名")
+	username = models.CharField(max_length=100, unique=True, verbose_name="用户名")
 	password = models.CharField(max_length=100, verbose_name="密码")
 	email = models.EmailField(verbose_name="邮箱")
 	phone = models.CharField(max_length=11, verbose_name="手机号")
@@ -26,9 +27,6 @@ class User(models.Model):
 	# 用户头像
 	avatar = models.CharField(max_length=128, default='/statics/img/default_avatar_male_180.gif', verbose_name="头像")
 
-	# avatar = models.ImageField(upload_to='statics/upload/%y%m%d', blank=True, null=True,
-	# 						   default='/statics/img/default_avatar_male_180.gif', verbose_name="头像")
-	
 	STATUS = (
 		('ON', 'online'),
 		('OFF', 'hide'),
@@ -40,31 +38,31 @@ def __str__(self):
 		return self.username
 
 
-class Group(models.Model):
+class IMGroup(models.Model):
 	'''
 	好友分组，属于某个用户
 	一个用户（User）有多个好友分组（Group），
 	一个好友分组（Group）只属于一个用户（User）
 	'''
 	id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
 	name = models.CharField(max_length=128)
-	owner = models.ForeignKey(User, on_delete=models.CASCADE, related_name='owner', default=None)
-	group_members = models.ManyToManyField(User)
+	owner = models.ForeignKey(IMUser, on_delete=models.CASCADE, related_name='owner', default=None)
+	group_members = models.ManyToManyField(IMUser, related_name='group_members')
 
 	def __str__(self):
 		return self.name
 
 
-class GroupChat(models.Model):
+class IMGroupChat(models.Model):
 	'''
 	群聊，独立于用户存在
 	'''
 	id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
 	name = models.CharField(max_length=128)
 	# 群聊管理员
-	group_admins = models.ManyToManyField(User, related_name="group_admins")
+	group_admins = models.ManyToManyField(IMUser, related_name="im_group_admins")
 	group_chat_avatar = models.CharField(max_length=128, default='/statics/img/default_avatar_male_180.gif')
-	group_chat_members = models.ManyToManyField(User, related_name='group_chat_members')
+	group_chat_members = models.ManyToManyField(IMUser, related_name='im_group_chat_members')
 
 	def __str__(self):
 		return self.name