From ce59480a7af647f152a61617666df1df08bcc8b6 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Mon, 18 Nov 2019 15:11:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=AA=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/utils/Template.php | 16 ++++++++--------
 crmeb/public/nginx.htaccess    |  6 ++++++
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 crmeb/public/nginx.htaccess

diff --git a/crmeb/crmeb/utils/Template.php b/crmeb/crmeb/utils/Template.php
index c95fb682..c8ed1146 100644
--- a/crmeb/crmeb/utils/Template.php
+++ b/crmeb/crmeb/utils/Template.php
@@ -44,15 +44,15 @@ class Template
      * @var array 'defaultData'=>[[],'array'] 生成的方法为 setDefaultData(array $value)
      */
     protected $propsRule = [
-        'defaultData'           => '',
-        'templateCode'          => [null,'string'],
+        'defaultData'           => [null, 'string'],
+        'templateCode'          => [null, 'string'],
         'templateData'          => [[],'array'],
-        'templateUrl'           => [null,'callable','postpositionUrl'],
-        'templateFormId'        => [null,'string'],
-        'sendType'              => [null,'string'],
-        'templateOpenId'        => [null,'string'],
-        'templateOpenId'        => [null,'string'],
-        'templateDefaultColor'  => [null,'string'],
+        'templateUrl'           => [null, 'callable', 'postpositionUrl'],
+        'templateFormId'        => [null, 'string'],
+        'sendType'              => [null, 'string'],
+        'templateOpenId'        => [null, 'string'],
+        'templateOpenId'        => [null, 'string'],
+        'templateDefaultColor'  => [null, 'string'],
     ];
 
     /**
diff --git a/crmeb/public/nginx.htaccess b/crmeb/public/nginx.htaccess
new file mode 100644
index 00000000..c6d74018
--- /dev/null
+++ b/crmeb/public/nginx.htaccess
@@ -0,0 +1,6 @@
+location / { 
+   if (!-e $request_filename) {
+   rewrite  ^(.*)$  /index.php?s=/$1  last;
+   break;
+    }
+ }
\ No newline at end of file