From 29e2d655fa13206b54568e9d47d3b21afcddfe47 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 29 Apr 2020 15:53:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 测试自动部署.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 测试自动部署.txt

diff --git a/测试自动部署.txt b/测试自动部署.txt
new file mode 100644
index 00000000..e69de29b

From 2120e3a136616be426e71f2e030f9879923cd684 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Thu, 30 Apr 2020 10:12:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=EF=BC=8C=E7=A7=BB=E5=87=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wysiwyg/ckfinder/config.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/wysiwyg/ckfinder/config.php b/wysiwyg/ckfinder/config.php
index b1949fca..b249d8c6 100644
--- a/wysiwyg/ckfinder/config.php
+++ b/wysiwyg/ckfinder/config.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * CKFinder Configuration File
  *
@@ -100,11 +99,15 @@ switch ($sitecode){
 		$site_url='';
 }
 
+//文件上传目录，使用相对路径，在文件夹中建立虚拟目录指向真实文件夹
+//需要移出项目文件夹，防止FTP访问到，防止误删
+$site_upload_dir=dirname(dirname(dirname(dirname(__FILE__)))).'/uploader-file/'.$sitecode;
+
 $config['backends'][] = array(
     'name'         => 'default',
     'adapter'      => 'local',
     'baseUrl'      =>  $site_url,
-    'root'         => dirname(__FILE__).('/userfiles/').$sitecode, // Can be used to explicitly set the CKFinder user files directory.
+    'root'         => $site_upload_dir, // Can be used to explicitly set the CKFinder user files directory.
     'chmodFiles'   => 0777,
     'chmodFolders' => 0755,
     'filesystemEncoding' => 'UTF-8',
@@ -127,22 +130,23 @@ $config['resourceTypes'][] = array(
     'backend'           => 'default'
 );
 $config['resourceTypes'][] = array(
-    'name'              => 'css', // Single quotes not allowed.
-    'directory'         => 'css',
+    'name'              => 'pic', // Single quotes not allowed.
+    'directory'         => 'pic',
     'maxSize'           => 0,
     'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,svg',
     'deniedExtensions'  => '',
     'backend'           => 'default'
 );
+/*
 $config['resourceTypes'][] = array(
-    'name'              => 'pic', // Single quotes not allowed.
-    'directory'         => 'pic',
+    'name'              => 'css', // Single quotes not allowed.
+    'directory'         => 'css',
     'maxSize'           => 0,
     'allowedExtensions' => '7z,aiff,asf,avi,bmp,csv,doc,docx,fla,flv,gif,gz,gzip,jpeg,jpg,mid,mov,mp3,mp4,mpc,mpeg,mpg,ods,odt,pdf,png,ppt,pptx,pxd,qt,ram,rar,rm,rmi,rmvb,rtf,sdc,sitd,swf,sxc,sxw,tar,tgz,tif,tiff,txt,vsd,wav,wma,wmv,xls,xlsx,zip,svg',
     'deniedExtensions'  => '',
     'backend'           => 'default'
 );
-/*
+
 $config['resourceTypes'][] = array(
     'name'              => 'Files', // Single quotes not allowed.
     'directory'         => 'file',