diff --git a/app/admin/controller/Upgrade.php b/app/admin/controller/Upgrade.php
index 0bf3047..cc92bb4 100644
--- a/app/admin/controller/Upgrade.php
+++ b/app/admin/controller/Upgrade.php
@@ -18,8 +18,6 @@ use app\common\controller\AdminController;
 use think\facade\View;
 use think\facade\Request;
 use think\facade\Db;
-use think\exception\ValidateException;
-use think\facade\Cache;
 use taoler\com\Api;
 use taoler\com\Str;
 use taoler\com\Files;
@@ -112,19 +110,26 @@ class Upgrade extends AdminController
 
 		}
 
-/*		//版本比较
-		$version_num = $versions->version;	//最新版本
-		$up_num =$versions->up_num;	//可更新版本数
-		$res = version_compare($version_num,$this->sys_version_num,'>');
-		if($res){
-			return json(['code'=>1,'msg'=>'发现新版本','version'=>$version_num,'upnum'=>$up_num]);
-		} else {
-			return json(['code'=>0,'msg'=>'暂时还没更新哦！ ==8']);
-		}
-*/
         return $res;
 	}
-	
+
+    /**
+     * 备份
+     * @param string $dir
+     * @param string $backDir
+     * @param array $ex
+     * @return \think\response\Json
+     */
+	public function backFile(string $dir,string $backDir,array $ex)
+    {
+        $backRes = Files::copydirs($dir, $backDir, $ex);
+        $backData = $backRes->getData();
+        if($backData['code'] == -1){
+            Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'error','progress'=>'25%','msg'=>'备份失败!']);
+            return json(['code'=>-1,'msg'=>$backRes['msg']]);
+        }
+        Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'30%','msg'=>'执行文件备份成功！']);
+    }
 	
     /**
      * 在线更新
@@ -133,11 +138,11 @@ class Upgrade extends AdminController
     {
 		$url = $this->sys['upgrade_url'].'?url='.$this->sys['domain'].'&key='.$this->sys['key'].'&ver='.$this->sys_version;
 		$versions = Api::urlGet($url);
-        Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'check','progress'=>'0%','msg'=>'---------------升级检测开始---------------']);
+        Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'check','progress'=>'0%','msg'=>'===>升级检测开始===>']);
 		//判断服务器状态
 		$version_code = $versions->code;
 		if($version_code == -1){
-            Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'check eroor','progress'=>'5%','msg'=>'---------------服务器链接失败---------------']);
+            Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'check eroor','progress'=>'5%','msg'=>'===>服务器链接失败===>']);
 			return json(['code'=>$version_code,'msg'=>$versions->msg]);
 		}
 
@@ -147,7 +152,7 @@ class Upgrade extends AdminController
 		//判断远程文件是否可用存在
 		$header = get_headers($file_url, true);
 		if(!isset($header[0]) && (strpos($header[0], '200') || strpos($header[0], '304'))){
-			return json(["code"=>-1,"msg"=>"获取远程文件失败"]);
+			return json(['code'=>-1,'msg'=>'获取远程文件失败']);
 		}
 
         //把远程文件放入本地
@@ -162,42 +167,41 @@ class Upgrade extends AdminController
 
         if(!$cpfile)
         {
-            return json(["code"=>-1,"msg"=>"下载升级文件失败"]);  
+            return json(['code'=>-1,'msg'=>'下载升级文件失败']);  
         }
         //记录下日志
         Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'20%','msg'=>'上传升级包成功！']);
-/**/
+
         //升级前备份代码
 		$ex = array('.git','.idea','runtime','data','addons','config','extend');  //  排除备份文件夹
-		$backup_code_res = Files::copydirs('../', $this->backup_dir, $ex);
-		if(!$backup_code_res){
-            Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'error','progress'=>'25%','msg'=>'备份失败!']);
-			return json(["code"=>0,"msg"=>"备份失败"]);
-		}
-        Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'30%','msg'=>'执行文件备份成功！']);
-
+        $this->backFile($this->root_dir,$this->backup_dir,$ex);
 
         //执行升级
-        $upres = $this->execute_update($package_file);
+        $updateRes = $this->execute_update($package_file);
+		$upDate = $updateRes->getData();
+		if($upDate['code'] == -1){
+			return json(['code'=>-1,'msg'=>$upDate['msg']]);
+		}
+		
 		//更新版本
 		//Db::name('system')->update(['sys_version_num'=>$version_num,'id'=>1]);
-		//$res = Config::set(['version' => $version_num], 'taoler');
+        $setConf = new SetConf;
         $value = [
             'version'    => $version_num
         ];
-        $setconf = new SetConf;
-		$upres = $setconf->setconfig('taoler',$value);
-		
-		if($upres){
-			return json(["code"=>0,"msg"=>"升级成功"]);
-		}else {
-			return json(["code"=>-1,"msg"=>"升级失败"]);
+
+		$upRes = $setConf->setConfig('taoler',$value);
+		$result = $upRes->getData();
+		if($result['code'] == -1){
+			return json(['code'=>-1,'msg'=>$result['msg']]);
 		}
+		return json(['code'=>0,'msg'=>'升级成功']);
+		
     }
 
     /**
      * @param string $package_file
-     * @return bool|\think\response\Json
+     * @return \think\response\Json
      */
     private function execute_update(string $package_file)
     {
@@ -209,19 +213,18 @@ class Upgrade extends AdminController
 
         if(!$unzip_res)
         {
-            $this->save_log("解压失败");
-            return json(["code"=>0,"msg"=>"解压失败"]);
+            return json(['code'=>-1,'msg'=>'解压失败']);
         }
         //解压成功，得到文件夹
-        //$package_name = str_replace(".zip","",$package_file);
+        //$package_name = str_replace('.zip','',$package_file);
 
         Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'50%','msg'=>'升级文件解压成功！']);
 
         /*
                 //升级mysql
-                if(file_exists($this->upload_dir.'/'.$package_file."/mysql/mysql_update.sql"))
+                if(file_exists($this->upload_dir.'/'.$package_file.'/mysql/mysql_update.sql'))
                 {
-                    $result = $this->database_operation($this->upload_dir.'/'.$package_file."/mysql/mysql_update.sql");
+                    $result = $this->database_operation($this->upload_dir.'/'.$package_file.'/mysql/mysql_update.sql');
                     if(!$result['code'])
                     {
                         echo json($result);die;
@@ -233,24 +236,22 @@ class Upgrade extends AdminController
         if(is_dir($zipPath))
         {
             //升级PHP
-            $cp_res = Files::copyDirs($zipPath,$this->root_dir);
-            if(!$cp_res)
+            $cpRes = Files::copyDirs($zipPath,$this->root_dir);
+			$cpData = $cpRes->getData();
+            //更新失败
+            if($cpData['code'] == -1)
             {
-                $this->save_log("php更新失败");
                 //数据库回滚
-                if(file_exists($this->upload_dir.'/'.$package_file."/mysql/mysql_rockback.sql"))
+/*
+                if(file_exists($this->upload_dir.'/'.$package_file.'/mysql/mysql_rockback.sql'))
                 {
-                    $this->save_log("数据库回滚");
-                    $this->database_operation($this->upload_dir.'/'.$package_file."/mysql/mysql_rockback.sql");
-
+                    $this->database_operation($this->upload_dir.'/'.$package_file.'/mysql/mysql_rockback.sql');
                 }
-
+*/
                 //php代码回滚 升级前备份的代码
-
-                $backup_code_res = Files::copydirs($this->backup_dir, $this->root_dir);
-                if($backup_code_res){
-                    return json(["code"=>0,"msg"=>"php更新失败"]);
-                }
+                Files::copydirs($this->backup_dir, $this->root_dir);
+                
+				return json(['code'=>-1,'msg'=>$cpData['msg']]);
             }
         }
 
@@ -264,7 +265,7 @@ class Upgrade extends AdminController
         //更新php的版本号了(应该跟svn／git的版本号一致)
         //更新数据库的版本号了(应该跟svn／git的版本号一致)
 
-        return true;
+        return json(['code'=>0,'msg'=>'升级文件执行成功']);
     }
 
 	/**
@@ -273,77 +274,51 @@ class Upgrade extends AdminController
     public function uploadZip()
     {
 		$files = request()->file('file');
-        if($files)
-        {
-			$name = $files->getOriginalName();
-            if(!$name)
-            {
-                return json(["code"=>0,"msg"=>"请上传升级包文件"]);
-            }
-        }
+		$name = $files->getOriginalName();
+
         //校验后缀
-        $astr = explode('.',$name);
-        $ext = array_pop($astr);
+        $ext = pathinfo($name,PATHINFO_EXTENSION);  //文件后缀
         if($ext != 'zip')
         {
-            return json(["code"=>0,"msg"=>"请上传文件格式不对"]);
+            return json(['code'=>0,'msg'=>'请上传文件格式不对']);
         }
         //对比版本号
-        $astr = explode('_',$name);
-        $version_num = str_replace(".zip", '',array_pop($astr));
-		//var_dump($version_num);
-        if(!$version_num)
-        {
-            return json(["code"=>0,"msg"=>"获取版本号失败"]);
+        $fname = pathinfo($name,PATHINFO_FILENAME);   //无后缀文件名
+        $version_num = array_pop(explode('_',$fname));
+
+        $verRes = version_compare($version_num,$this->sys_version,'>');
+        if(!$verRes){
+            return json(['code'=>-1,'msg'=>'不能降级，请选择正确版本']);
         }
-        //对比
-        if(!$this->compare_version($version_num))
-        {
-            return json(["code"=>0,"msg"=>"版本升级不能降级！请检查..."]);  
-        }
-		
-		if(!is_dir($this->upload_dir)){
-			$this->create_dirs($this->upload_dir);
-		}
-		
-		$package_file = $this->upload_dir.$name;
+
+		$upDir = $this->upload_dir.$fname;
 		//$mv = $files->move('/../tmp/web/upload_dir',$version_num);
-		$mfile = move_uploaded_file($files,$package_file);
+		$mfile = move_uploaded_file($files,$upDir);
         if(!$mfile)
         {
-            return json(["code"=>0,"msg"=>"上传文件失败"]);  
-        } 
+            return json(['code'=>0,'msg'=>'上传文件失败']);  
+        }
 
-		//升级前备份代码
-		$ex = array('app','view');
-		$backup_code_res = $this->copydir('../', $this->backup_dir, $ex);
-		if(!$backup_code_res){
-			$this->save_log("备份失败！");
-			return json(["code"=>0,"msg"=>"备份失败"]);
-		}
+        //升级前备份代码
+        $ex = array('.git','.idea','runtime','data','addons','config','extend');  //  排除备份文件夹
+        $this->backFile($this->root_dir,$this->backup_dir,$ex);
 		
         //执行升级
-        $upres = $this->execute_update($package_file);
-		
-		//更新版本
-		Db::name('system')->update(['sys_version_num'=>$version_num,'id'=>1]);
-		//Config::set(['version' => $version_num], 'taoler');
-		if($upres){
-			return json(["code"=>1,"msg"=>"升级成功"]);
-		}else {
-			return json(["code"=>0,"msg"=>"升级失败"]);
-		}
-    }
+        $upres = $this->execute_update($mfile);
 
-    /**
-     * 比较代码版本
-     * @return [type] [description]
-     */
-    private function compare_version($version_num='1.0.0')
-    {
-        
-        return version_compare($version_num,$this->sys_version_num,'>');
-		//return json(['code'=>1,'msg'=>'版本','data'=>$version]);
+        //更新版本
+        //Db::name('system')->update(['sys_version_num'=>$version_num,'id'=>1]);
+        $setConf = new SetConf;
+        $value = [
+            'version'    => $version_num
+        ];
+
+        $upRes = $setConf->setConfig('taoler',$value);
+        $result = $upRes->getData();
+        if($result['code'] == -1){
+            return json(['code'=>-1,'msg'=>$result['msg']]);
+        }
+        return json(['code'=>0,'msg'=>'升级成功']);
     }
 
 
@@ -352,84 +327,14 @@ class Upgrade extends AdminController
      */
     public function database_operation($file)
     {
-        $mysqli = new mysqli("localhost","root","root","test");
+        $mysqli = new mysqli('localhost','root','root','test');
         if($mysqli->connect_errno)
         {
-            return json(["code"=>0,"msg"=>"Connect failed:".$mysqli->connect_error]);
+            return json(['code'=>0,'msg'=>'Connect failed:'.$mysqli->connect_error]);
         }
         $sql = file_get_contents($file);
         $a = $mysqli->multi_query($sql);
-        return ["code"=>1,"msg"=>"数据库操作OK"];
+        return ['code'=>1,'msg'=>'数据库操作OK'];
     }
 
-
-    /**
-     * 记录日志
-     */
-    public function save_log($msg,$action="update")
-    {
-        $msg .= date("Y-m-d H:i:s").":".$msg."\n";
-        if($action == "update")
-        {
-            exec(" echo '".$msg."' >>  $this->update_log ");
-        }else
-        {
-            exec(" echo '".$msg."' >>  $this->return_log ");
-        }
-    }
-	
-	
-	/**
-	 * 复制文件夹$source下的文件和子文件夹下的内容到$dest下 升级+备份代码
-	 * @param $source
-	 * @param $dest
-	 * @param $ex 定义指定复制的目录,默认全复制
-	 */
-	public function copydir($source, $dest, $ex=array())
-	{
-		if (!file_exists($dest)) mkdir($dest);
-		if($handle = opendir($source)){
-			while (($file = readdir($handle)) !== false) {
-
-				if (( $file != '.' ) && ( $file != '..' )) {
-					if ( is_dir($source . $file) ) {
-                        //拷贝排除的文件夹
-                        if(!in_array($file,$ex)){
-                            self::copyDirs($source . $file.'/', $dest . $file.'/');
-                        }
-					} else {
-						copy($source. $file, $dest . $file);
-					}
-				}
-			}
-			closedir($handle);
-			
-		} else {
-			return false;
-		}
-		return true;	
-	}
-	
-	//创建多文件夹
-	public function create_dirs($path)
-	{
-	  if (!is_dir($path))
-	  {
-		$directory_path = "";
-		$directories = explode("/",$path);
-		array_pop($directories);
-	   
-		foreach($directories as $directory)
-		{
-		  $directory_path .= $directory."/";
-		  if (!is_dir($directory_path))
-		  {
-			mkdir($directory_path);
-			chmod($directory_path, 0777);
-		  }
-		}
-	  }
-	}
-
-
 }
\ No newline at end of file
diff --git a/app/admin/view/upgrade/index.html b/app/admin/view/upgrade/index.html
index e2f504e..b7d31c4 100644
--- a/app/admin/view/upgrade/index.html
+++ b/app/admin/view/upgrade/index.html
@@ -160,6 +160,7 @@
 		elem: '#select-file'
 		,url: "{:url('admin/upgrade/uploadzip')}"
 		,accept: 'file'
+        ,acceptMime: 'application/zip'
 		,field: 'file'
 		,auto: false
 		,exts: 'zip|rar|7z'
@@ -171,7 +172,7 @@
 		}
 		,done: function(res){
 			layer.closeAll('loading'); //关闭loading
-			if(res.code == 1){
+			if(res.code == 0){
 				layer.msg(res.msg,{
 					icon:6,
 					tiye:2000
@@ -207,7 +208,7 @@
 				data:{"key":key},
 				daType:"json",
 				success:function (data){
-					if (data.code == 1) {
+					if (data.code == 0) {
 						layer.msg(data.msg,{
 							icon:6,
 							time:2000
@@ -254,7 +255,7 @@
 					data:{"key":field.key,"upcheck_url":field.upcheck_url,"upgrade_url":field.upgrade_url},
 					daType:"json",
 					success:function (data){
-						if (data.code == 1) {
+						if (data.code == 0) {
 							layer.msg(data.msg,{
 								icon:6,
 								time:2000
diff --git a/app/common/lib/SetConf.php b/app/common/lib/SetConf.php
index 08f5e91..2893e66 100644
--- a/app/common/lib/SetConf.php
+++ b/app/common/lib/SetConf.php
@@ -10,12 +10,12 @@ namespace app\common\lib;
 class SetConf
 {
     /**
-     * 修改配置文件
-     * @param  string $file 配置文件名(不需要后辍)
-     * @param  array  $data 需要更新或添加的配置
-     * @return bool
+     * 修改配置
+     * @param string $file
+     * @param array $data
+     * @return \think\response\Json
      */
-    function setconfig($file,$data)
+    function setConfig(string $file,array $data=[])
     {
         if (is_array($data)){
             $fileurl = app()->getConfigPath() . $file.".php";
@@ -26,10 +26,19 @@ class SetConf
                 $reps = "'". $key. "'". "   => " . "'".$value ."',";
                 $string = preg_replace($pats, $reps, $string); // 正则查找然后替换
             }
-            file_put_contents($fileurl, $string); // 写入配置文件
-            return true;
+			
+			try {
+				file_put_contents($fileurl, $string); // 写入配置文件
+			}
+			catch (\Exception $e) {
+				// 这是进行异常捕获
+				//$e->getMessage();
+				return json(['code'=>-1,'msg'=>$fileurl . '无写入权限']);
+			}
+
+            return json(['code'=>0,'msg'=>'配置修改成功']);
         }else{
-            return false;
+           return json(['code'=>-1,'msg'=>'配置项错误！']);
         }
     }
 }
diff --git a/app/common/lib/ZipFile.php b/app/common/lib/ZipFile.php
index a01517a..bda9532 100644
--- a/app/common/lib/ZipFile.php
+++ b/app/common/lib/ZipFile.php
@@ -50,7 +50,7 @@ class ZipFile
 								//zip_entry_close($zip);	
 							}else{
 								//echo '文件夹内已存在文件 "' . $file_name . '" <pre />';
-								return json(['code'=>0,'msg'=>'文件夹内已存在文件']);
+								return json(['code'=>-1,'msg'=>'文件夹内已存在文件']);
 							}
 							
 						}else {
diff --git a/extend/taoler/com/Files.php b/extend/taoler/com/Files.php
index 77ea35b..54482c7 100644
--- a/extend/taoler/com/Files.php
+++ b/extend/taoler/com/Files.php
@@ -101,15 +101,18 @@ class Files
 	}
 
     /**
-     * 复制文件夹$source下的文件和子文件夹下的内容到$dest下 升级+备份代码
-     * @param $source
-     * @param $dest
-     * @param array $ex 指定只复制$source下的目录,默认全复制
-     * @return bool
+     * 复制文件夹文件和子文目录文件，可排除目录复制 升级+备份代码
+     * @param string $source 源目录
+     * @param string $dest  目标目录
+     * @param array $ex 排除目录
+     * @return \think\response\Json
      */
-	public static function copyDirs($source, $dest, $ex=array())
+	public static function copyDirs(string $source,string $dest, array $ex=array())
 	{
-		if (!file_exists($dest)) mkdir($dest);
+		if (is_dir($source)){
+			if (!is_dir($dest)) {
+            	self::mkdirs($dest, 0777, true);
+        	}
 			if($handle = opendir($source)){
 				while (($file = readdir($handle)) !== false) {
 					if (( $file != '.' ) && ( $file != '..' )) {
@@ -119,16 +122,23 @@ class Files
                                 self::copyDirs($source . $file.'/', $dest . $file.'/');
                             }
 						} else {
+							//copy($source. $file, $dest . $file);
+							
 						    //拷贝文件
-							copy($source. $file, $dest . $file);
+							try{
+								copy($source. $file, $dest . $file);
+							}
+							catch (\Exception $e) {
+								// 这是进行异常捕获
+								return json(['code'=>-1,'msg'=>$dest . $file . '无写入权限']);
+							}
 						}
 					}
 				}
 				closedir($handle);
-			} else {
-			return false;
+			}
 		}
-		return true;	
+		return json(['code'=>0,'msg'=>'复制完成']);	
 	}
 
     /**