chenjunkai 6 years ago
parent
commit
8f8ac4f280
4 changed files with 4 additions and 33 deletions
  1. 1 2
      Ansjer/formal_settings.py
  2. 1 2
      Ansjer/local_settings.py
  3. 2 2
      Ansjer/test_settings.py
  4. 0 27
      Model/models.py

+ 1 - 2
Ansjer/formal_settings.py

@@ -88,8 +88,7 @@ DATABASES = {'default': {
     'PASSWORD': DATABASES_PASS,
     'HOST': SERVER_HOST,
     'PORT': '3306',
-    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True,
-                'init_command': "SET sql_mode='STRICT_TRANS_TABLES';SET GLOBAL max_connections = 100000"},
+    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
     'AUTOCOMMIT': True
 }}
 

+ 1 - 2
Ansjer/local_settings.py

@@ -84,8 +84,7 @@ DATABASES = {'default': {
     'PASSWORD': DATABASES_PASS,
     'HOST': SERVER_HOST,
     'PORT': '3306',
-    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True,
-                'init_command': "SET sql_mode='STRICT_TRANS_TABLES';SET GLOBAL max_connections = 100000"},
+    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
     'AUTOCOMMIT': True
 }}
 

+ 2 - 2
Ansjer/test_settings.py

@@ -1,6 +1,7 @@
 import os
 from Ansjer.config import BASE_DIR
 
+
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 DEBUG = True
 # DEBUG = False
@@ -89,8 +90,7 @@ DATABASES = {'default': {
     'PASSWORD': DATABASES_PASS,
     'HOST': SERVER_HOST,
     'PORT': '3306',
-    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True,
-                'init_command': "SET sql_mode='STRICT_TRANS_TABLES';SET GLOBAL max_connections = 100000"},
+    'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
     'AUTOCOMMIT': True
 }}
 

+ 0 - 27
Model/models.py

@@ -101,33 +101,6 @@ class Role(models.Model):
     def natural_key(self):
         return (self.roleName,)
 
-    # def has_perm(self, permission, obj=None):
-    #     if self.rid == 100:
-    #         return True
-    #
-    #     permlist = self.permission.all()
-    #     for perm in permlist:
-    #         if perm.permName == permission:
-    #             return True
-    #
-    #     return False
-
-    # def get_all_perms_id(self):
-    #     perms = self.permission.all()
-    #     permslist = []
-    #     if self.rid == 100:
-    #         perms = Permissions.objects.all()
-    #         for perm in perms:
-    #             permslist.append(perm.id)
-    #         return permslist
-    #     else:
-    #         permlist_tmp = []
-    #         for perm in perms:
-    #             permlist_tmp.append(perm.id)
-    #         permSet = set(permlist_tmp)
-    #         permslist = list(permSet)
-    #         permslist.sort()
-    #         return permslist
 
     def get_all_permission(self):
         perms = self.permission.all()