From e285faf0802157e972907523f16e76ee436cebcf Mon Sep 17 00:00:00 2001
From: zypo <yupozhang@gmail.com>
Date: Wed, 11 Mar 2020 21:23:12 +0800
Subject: [PATCH] =?UTF-8?q?U=20Deploy=E8=A1=A8rst=5Fnotify=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_api/apps/app/models.py                      | 2 +-
 spug_web/src/pages/system/setting/LDAPSetting.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spug_api/apps/app/models.py b/spug_api/apps/app/models.py
index 010314f..25aca33 100644
--- a/spug_api/apps/app/models.py
+++ b/spug_api/apps/app/models.py
@@ -41,7 +41,7 @@ class Deploy(models.Model, ModelMixin):
     host_ids = models.TextField()
     extend = models.CharField(max_length=2, choices=EXTENDS)
     is_audit = models.BooleanField()
-    rst_notify = models.CharField(max_length=255)
+    rst_notify = models.CharField(max_length=255, null=True)
 
     created_at = models.CharField(max_length=20, default=human_datetime)
     created_by = models.ForeignKey(User, models.PROTECT, related_name='+')
diff --git a/spug_web/src/pages/system/setting/LDAPSetting.js b/spug_web/src/pages/system/setting/LDAPSetting.js
index 42956bf..b8c07a0 100644
--- a/spug_web/src/pages/system/setting/LDAPSetting.js
+++ b/spug_web/src/pages/system/setting/LDAPSetting.js
@@ -82,13 +82,13 @@ class LDAPSetting extends React.Component {
           <Form.Item labelCol={{span: 8}} wrapperCol={{span: 16}} required label="LDAP搜索规则">
             {getFieldDecorator('rules', {initialValue: this.setting['rules'],
               rules: [{required: true, message: '请输入LDAP搜索规则'}]})(
-              <Input placeholder="请输入，例如：cn"/>
+              <Input placeholder="例如：cn"/>
             )}
           </Form.Item>
           <Form.Item labelCol={{span: 8}} wrapperCol={{span: 16}} required label="基本DN">
             {getFieldDecorator('base_dn', {initialValue: this.setting['base_dn'],
               rules: [{required: true, message: '请输入LDAP基本DN'}]})(
-              <Input placeholder="请输入，例如：dc=spug,dc=dev"/>
+              <Input placeholder="例如：dc=spug,dc=dev"/>
             )}
           </Form.Item>
           <Form.Item>