lots

jasset/models.py

@@ -59,8 +59,8 @@ class AssetGroup(models.Model):
 
 
 class Asset(models.Model):
-    ip = models.IPAddressField(unique=True)
+    ip = models.GenericIPAddressField(unique=True)
-    port = models.IntegerField(max_length=6)
+    port = models.IntegerField()
     group = models.ManyToManyField(AssetGroup)
     username = models.CharField(max_length=20, blank=True, null=True)
     password = models.CharField(max_length=80, blank=True, null=True)

jumpserver/settings.py

@@ -77,7 +77,7 @@ INSTALLED_APPS = (
     'juser',
     'jasset',
     'jperm',
-    # 'jlog',
+    'jlog',
 )
 
 MIDDLEWARE_CLASSES = (

jumpserver/views.py

@@ -15,6 +15,7 @@ from jumpserver.api import *
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from settings import BASE_DIR
+from jlog.models import Log
 
 def getDaysByNum(num):
     today = datetime.date.today()

juser/user_api.py

@@ -4,7 +4,7 @@ from Crypto.PublicKey import RSA
 
 from juser.models import AdminGroup
 from jumpserver.api import *
-
+from  jumpserver.settings import BASE_DIR
 
 def group_add_user(group, user_id=None, username=None):
     """