From 8658675f6751bf14f2277fbcb3099a21885f5cab Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 9 Jan 2017 23:12:32 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E9=87=8D=E5=91=BD=E5=90=8Dapplicati?=
 =?UTF-8?q?ons=E5=AF=BC=E8=87=B4api=E8=AF=B7=E6=B1=82content=5Ftype?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/static/js/jumpserver.js | 2 +-
 mac_requirements.py          | 0
 requirements.txt             | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 mac_requirements.py

diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index daa4df9b3..c7a3144a6 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -195,7 +195,7 @@ function APIUpdateAttr(props) {
     url: props.url,
     type: props.method || "PATCH",
     data: props.body,
-    contentType: props.content_type || "applications/json; charset=utf-8",
+    contentType: props.content_type || "application/json; charset=utf-8",
     dataType: props.data_type || "json"
   }).done(function(data, textStatue, jqXHR) {
     toastr.success(success_message);
diff --git a/mac_requirements.py b/mac_requirements.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/requirements.txt b/requirements.txt
index 5d1a0ab67..b26a583c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
 Django==1.10
 django-bootstrap-form==3.2.1
 logging==0.4.9.6
-Pillow==3.3.1
+Pillow==4.0.0
 djangorestframework==3.5.3
 ForgeryPy==0.1
 openpyxl==2.4.0
 celery==3.1.23
-paramiko==2.0.2
+paramiko==2.1.1
 ansible==2.1.2.0
 django-simple-captcha==0.5.2
 django-formtools==1.0
-- 
GitLab