Merge branch 'master' of code.simcu.com:jumpserver/jumpserver

apps/assets/api.py

 # ~*~ coding: utf-8 ~*~
-# 
+from rest_framework import serializers
+from .models import (
+    AssetGroup,Asset,IDC,AssetExtend
+)
+from rest_framework import viewsets,serializers
 
+class AssetGroupSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AssetGroup
+        #exclude = [
+            #'password', 'first_name', 'last_name', 'secret_key_otp',
+            #'private_key', 'public_key', 'avatar',
+        #]
+
+class AssetSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Asset
+        #fields = ('id', 'title', 'code', 'linenos', 'language', 'style')
+
+class IDCSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = IDC
+        #fields = ('id', 'title', 'code', 'linenos', 'language', 'style')
+        
+class AssetGroupViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows AssetGroup to be viewed or edited.
+    """
+    queryset = AssetGroup.objects.all()
+    serializer_class = AssetGroupSerializer
+
+class AssetViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows Asset to be viewed or edited.
+    """
+    queryset = Asset.objects.all()
+    serializer_class = AssetSerializer
+
+class IDCViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows IDC to be viewed or edited.
+    """
+    queryset = IDC.objects.all()
+    serializer_class = IDCSerializer
\ No newline at end of file

apps/assets/urls.py

 # coding:utf-8
-from django.conf.urls import url
+from django.conf.urls import url,include
 from .views import *
-
+from .api import (
+    AssetGroupViewSet,AssetViewSet,IDCViewSet
+)
+from rest_framework import routers
+router = routers.DefaultRouter()
+router.register(r'assetgroup', AssetGroupViewSet)
+router.register(r'asset', AssetViewSet)
+router.register(r'idc', IDCViewSet)
 app_name = 'assets'
 
 urlpatterns = [
@@ -9,4 +16,5 @@ urlpatterns = [
     url(r'^list/$', AssetListView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/delete/$', AssetDeleteView.as_view(), name='asset-list'),
     url(r'^(?P<pk>[0-9]+)/detail/$', AssetDetailView.as_view(), name='asset-detail'),
+    url(r'^api/v1.0/', include(router.urls)),
 ]

apps/manage.py

 #!/usr/bin/env python
 import os
 import sys
+import errno
 
 if __name__ == "__main__":
+    try:
+        os.makedirs('../logs')
+    except:
+        pass
+
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings")
     try:
         from django.core.management import execute_from_command_line