From 829df26b0ff3627e536c0cf25510e3155e73748d Mon Sep 17 00:00:00 2001
From: lijiejie <lijiejie25100@sina.com>
Date: Fri, 2 Sep 2016 22:49:51 +0800
Subject: [PATCH 1/6] create the api

---
 apps/assets/api.py | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/apps/assets/api.py b/apps/assets/api.py
index ecbf4289f..e1e1900e8 100644
--- a/apps/assets/api.py
+++ b/apps/assets/api.py
@@ -1,3 +1,45 @@
 # ~*~ 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

From cec5a7f2c6844e8d9a2253d0b61c370f16afd6b7 Mon Sep 17 00:00:00 2001
From: lijiejie <lijiejie25100@sina.com>
Date: Fri, 2 Sep 2016 22:51:10 +0800
Subject: [PATCH 2/6] create the restframework url

---
 apps/assets/urls.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/assets/urls.py b/apps/assets/urls.py
index 6b19a7de6..a49665411 100644
--- a/apps/assets/urls.py
+++ b/apps/assets/urls.py
@@ -1,7 +1,14 @@
 # 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)),
 ]

From 9fa70f6cb8695c9707527decc07e1a313c256fd6 Mon Sep 17 00:00:00 2001
From: lijiejie <lijiejie25100@sina.com>
Date: Fri, 2 Sep 2016 22:52:30 +0800
Subject: [PATCH 3/6] create a restframework api for cmdb models


From d371c0c5ae363685735ab61056c808726802cf48 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Sun, 4 Sep 2016 06:55:12 +0800
Subject: [PATCH 4/6] mkdirp

---
 apps/manage.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/manage.py b/apps/manage.py
index 0a67255e8..a721be061 100644
--- a/apps/manage.py
+++ b/apps/manage.py
@@ -1,8 +1,16 @@
 #!/usr/bin/env python
 import os
 import sys
+import errno
 
 if __name__ == "__main__":
+    try:
+        os.makedirs('./logs')
+    except OSError as exc: # Python > 2.5 (except OSError, exec: for Python < 2.5)
+        if exc.errno == errno.EEXIST and os.path.isdir('./logs'):
+            pass
+        else: raise
+
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings")
     try:
         from django.core.management import execute_from_command_line

From 32c49c080cfde7cbfaeeb045e3957e9493dcc514 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Sun, 4 Sep 2016 07:04:15 +0800
Subject: [PATCH 5/6] update

---
 apps/manage.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/manage.py b/apps/manage.py
index a721be061..d24c5fd38 100644
--- a/apps/manage.py
+++ b/apps/manage.py
@@ -5,11 +5,9 @@ import errno
 
 if __name__ == "__main__":
     try:
-        os.makedirs('./logs')
-    except OSError as exc: # Python > 2.5 (except OSError, exec: for Python < 2.5)
-        if exc.errno == errno.EEXIST and os.path.isdir('./logs'):
-            pass
-        else: raise
+        os.makedirs('../logs')
+    except:
+        pass
 
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jumpserver.settings")
     try:

From 724b1c6fd4a7688b0d1795201c76b008d2de3313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=BF=E5=AE=8F=E4=BC=9F?= <ibuler@qq.com>
Date: Sun, 4 Sep 2016 12:37:42 +0800
Subject: [PATCH 6/6] Add new directory logs

---
 logs/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logs/.gitkeep

diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 000000000..e69de29bb