From eca10433d410ab1b8570f8ab20a55e3713595521 Mon Sep 17 00:00:00 2001
From: wangzhaocui <18722597281>
Date: Tue, 12 Apr 2022 13:37:56 +0800
Subject: [PATCH] =?UTF-8?q?ftp=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/master/controller/Datebase.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/master/controller/Datebase.php b/application/master/controller/Datebase.php
index c9dff68..89183f2 100644
--- a/application/master/controller/Datebase.php
+++ b/application/master/controller/Datebase.php
@@ -220,7 +220,7 @@ class Datebase extends Controller{
      */
     public function dataPush(){
         $data = $this->request->post();
-        //$data["journal_stage_id"] = 305;
+        $data["journal_stage_id"] = 305;
         $stage_info = $this->journal_stage_obj->where("journal_stage_id",$data["journal_stage_id"])->find();
         $this->createEmailFile($data["journal_stage_id"]);
         // 发送ftp
@@ -343,9 +343,9 @@ class Datebase extends Controller{
 
         // zip生成成功后发送ftp
         if($resJosn['code'] == 0){
-            $name = $baseDir.$outfileTitle.".zip";
+            $url = $baseDir.$outfileTitle.".zip";
             // 发送ftp
-            $this->sendFtp($name);
+            $this->sendFtp($url,$outfileTitle);
         }
 
 
@@ -445,7 +445,7 @@ class Datebase extends Controller{
 
 
     // 连接ftp
-    private  function  sendFtp($name,$url){
+        private  function  sendFtp($url,$title){
         $ftp=[
             'server'=>'FTP.cnki.net',
             'user'=>'glo616cnki',
@@ -456,14 +456,14 @@ class Datebase extends Controller{
         if(!$res){ //连接失败
             exit('连接失败');
         }
-        $data = ftp_put($con,ROOT_PATH,$url,FTP_ASCII);
+        $name = iconv("UTF-8","GBK",$title.'.zip');
+        $data = ftp_put($con,'/'.$name,$url,FTP_BINARY);
         if(!$data){ // 上传失败
             exit('上传失败');
         }
         ftp_close($con);
 
     }
+    
 
-    
-    
 }