Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/NewCallCenter5.1_API

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -295,7 +295,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Configs\log4net.config" />
-    <Content Include="Configs\system.config" />
+    <Content Include="Configs\system.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="Properties\PublishProfiles\1q.pubxml" />
     <None Include="Properties\PublishProfiles\ddr.pubxml" />
     <None Include="Properties\PublishProfiles\my.pubxml" />

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -33,5 +33,5 @@
   <!-- 设置密码 -->
   <add key="password" value="Bing123456" />
   <!-- 文件保存位置 -->
-  <add key="saveloc" value="d:\upload_wav\" />
+  <add key="saveloc" value="d:\\upload_wav\" />
 </appSettings>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IVRWordsController.cs

@@ -187,97 +187,6 @@ namespace CallCenterApi.Interface.Controllers
                     dModel.F_WavOldName = oldname;
                     dModel.F_WavNewName = newname;
                     dModel.F_WavPath = path;
-                    #region 上传语音文件
-                    //HttpPostedFile _upFile = RequestString.GetFile("upFile");
-                    //if (_upFile != null)
-                    //{
-
-                    //    string datename = DateTime.Now.ToString("yyyyMMddHHMMss");
-                    //    string fullFileName = datename + "_" + _upFile.FileName;
-                    //    string ffmpegLocation = Server.MapPath("~/");
-
-                    //    #region 读取配置的上传路径-原文件和修改过格式的文件均上传至此
-                    //    string savedir = Configs.GetValue("saveloc");
-                    //    if (!System.IO.Directory.Exists(savedir))
-                    //    {
-                    //        System.IO.Directory.CreateDirectory(savedir);
-                    //    }
-                    //    #endregion
-
-                    //    #region 保存原文件
-                    //    string physicalpath = Server.MapPath(savedir + fullFileName);
-                    //    _upFile.SaveAs(physicalpath);
-                    //    #endregion
-
-                    //    #region 修改音频格式
-                    //    if (!string.IsNullOrEmpty(physicalpath))
-                    //    {
-                    //        //通过cmd执行ffmpeg改变音频采样率
-                    //        Process p = new Process();
-                    //        p.StartInfo.FileName = "cmd.exe";
-                    //        p.StartInfo.UseShellExecute = false;
-                    //        p.StartInfo.RedirectStandardOutput = true;
-                    //        p.StartInfo.RedirectStandardInput = true;
-                    //        p.StartInfo.RedirectStandardError = true;
-                    //        p.StartInfo.CreateNoWindow = true;
-
-                    //        string temp_filename = physicalpath.Split('\\').Last().Split('.')[0] + "_temp";
-
-                    //        p.Start();
-                    //        p.StandardInput.WriteLine("cd " + ffmpegLocation);
-                    //        p.StandardInput.WriteLine(ffmpegLocation.Split('\\').First());
-                    //        p.StandardInput.WriteLine("ffmpeg.exe");
-                    //        string changefile = "ffmpeg -i " + physicalpath + " -acodec pcm_u8 -ab 64 -ar 8000 -ac 1 " + savedir + "\\" + temp_filename + ".wav";
-                    //        p.StandardInput.WriteLine(changefile);
-                    //        Thread.Sleep(3000);
-                    //        p.StandardInput.WriteLine("exit");
-                    //        //Kill 是终止没有图形化界面的进程的唯一方法。
-                    //        p.Kill();
-
-                    //        #region 上传
-                    //        uploadFile upfile = new uploadFile();
-                    //        //通过读取配置文件，获取数据库
-                    //        string _ftp = Configs.GetValue("ftp");
-                    //        string _acc = Configs.GetValue("account");
-                    //        string _pwd = Configs.GetValue("password");
-
-                    //        upfile.ftpPath = _ftp;
-                    //        upfile.ftpUserID = _acc;
-                    //        upfile.ftpPassword = _pwd;
-                    //        FileInfo fi = new FileInfo(physicalpath);
-                    //        string uploadres = upfile.UploadLocalToFtp(savedir + "\\" + temp_filename + ".wav");
-                    //        if (uploadres == "上传成功！")
-                    //        {
-                    //            //写入日志
-                    //            string logfile = Server.MapPath("~/log.txt");
-                    //            if (!System.IO.File.Exists(logfile))
-                    //            {
-                    //                System.IO.File.Create(logfile);
-                    //            }
-                    //            //开始写入
-                    //            string str = DateTime.Now.ToString() + " 文件" + fullFileName + "上传成功";
-                    //            System.IO.File.AppendAllLines(logfile, new string[] { str }, Encoding.GetEncoding("gb2312"));
-
-                    //            int userId = CurrentUser.UserData.F_UserId;
-                    //            string ucode = "";
-                    //            if (userId != 0)
-                    //            {
-                    //                Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                    //                if (ua != null)
-                    //                    ucode = ua.F_UserCode;
-                    //            }
-                    //            dModel.F_WavOldName = fullFileName;
-                    //            dModel.F_WavNewName = temp_filename + ".wav";
-                    //            dModel.F_WavPath = savedir + "\\" + temp_filename + ".wav";
-                    //        }
-                    //        #endregion
-                    //    }
-                    //    #endregion
-
-                    //}
-                    //else
-                    //    return Error("参数传入失败");
-                    #endregion
                 }
                 if (id != null && id.Trim() != "")
                 {
@@ -379,16 +288,11 @@ namespace CallCenterApi.Interface.Controllers
                 #endregion
 
                 #region 保存原文件到本地指定目录
-                //string physicalpath = Server.MapPath(savedir + fullFileName);
-                //string physicalpath = savedir + fullFileName;
-                //20180207 本地不再保存 保存到项目中
-                //_upFile.SaveAs(physicalpath);
-                string dirpath = Server.MapPath(this.Request.ApplicationPath + "\\auoupload");
-                if (!System.IO.Directory.Exists(dirpath))
+                string path = this.Request.ApplicationPath + "/auoupload/" + fullFileName;
+                if (!System.IO.Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "/auoupload/")))
                 {
-                    System.IO.Directory.CreateDirectory(dirpath);
+                    System.IO.Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "/auoupload/"));
                 }
-                string path = this.Request.ApplicationPath + "/auoupload/" + fullFileName;
                 string physicalpath = Server.MapPath(path);
                 _upFile.SaveAs(physicalpath);
                 #endregion
@@ -396,6 +300,7 @@ namespace CallCenterApi.Interface.Controllers
                 #region 修改音频格式
                 if (!string.IsNullOrEmpty(physicalpath))
                 {
+                    # region 修改音频格式
                     //通过cmd执行ffmpeg改变音频采样率
                     Process p = new Process();
                     p.StartInfo.FileName = "cmd.exe";
@@ -417,7 +322,7 @@ namespace CallCenterApi.Interface.Controllers
                     p.StandardInput.WriteLine("exit");
                     //Kill 是终止没有图形化界面的进程的唯一方法。
                     p.Kill();
-
+                    #endregion
                     #region 上传
                     uploadFile upfile = new uploadFile();
                     //通过读取配置文件，获取数据库
@@ -428,30 +333,22 @@ namespace CallCenterApi.Interface.Controllers
                     upfile.ftpPath = _ftp;
                     upfile.ftpUserID = _acc;
                     upfile.ftpPassword = _pwd;
-                    FileInfo fi = new FileInfo(physicalpath);
                     //20180207 原文件同时保存
-                    string uploadres = upfile.UploadLocalToFtp(savedir + "\\" + temp_filename + ".wav");
+                    string uploadres = upfile.UploadLocalToFtp(savedir +  temp_filename + ".wav");
                     string uploadBeforres = upfile.UploadLocalToFtp(physicalpath);
                     if (uploadres == "上传成功！" && uploadBeforres == "上传成功！")
                     {
                         //写入日志
-                        string logfile = Server.MapPath("~/log.txt");
-                        if (!System.IO.File.Exists(logfile))
-                        {
-                            System.IO.File.Create(logfile);
-                        }
-                        //开始写入
-                        string str = DateTime.Now.ToString() + " 文件" + fullFileName + "上传成功";
-                        System.IO.File.AppendAllLines(logfile, new string[] { str }, Encoding.GetEncoding("gb2312"));
-
-                        int userId = CurrentUser.UserData.F_UserId;
-                        string ucode = "";
-                        if (userId != 0)
-                        {
-                            Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                            if (ua != null)
-                                ucode = ua.F_UserCode;
-                        }
+                        //string logfile = Server.MapPath("~/log.txt");
+                        //if (!System.IO.File.Exists(logfile))
+                        //{
+                        //    System.IO.File.Create(logfile);
+                        //}
+                        ////开始写入
+                        //string str = DateTime.Now.ToString() + " 文件" + fullFileName + "上传成功";
+                        //System.IO.File.AppendAllLines(logfile, new string[] { str }, Encoding.GetEncoding("gb2312"));
+
+
                         //删除本地文件
                         System.IO.File.Delete(savedir + fullFileName);
                         System.IO.File.Delete(savedir + temp_filename + ".wav");
@@ -465,7 +362,7 @@ namespace CallCenterApi.Interface.Controllers
                         return Success("文件上传成功", obj);
                     }
                     else
-                        return Error("文件上传失败，请重新上传");
+                        return Error("文件上传失败，请重新上传:::uploadres:" + uploadres + ":::::uploadBeforres::" + uploadBeforres);
                     #endregion
                 }
                 else

codegit/CallCenterCommon/CallCenter.Utility/uploadFile.cs

@@ -36,6 +36,7 @@ namespace CallCenter.Utility
             reqFTP.KeepAlive = false;// 默认为true，连接不会被关闭 // 在一个命令之后被执行  
             reqFTP.Method = WebRequestMethods.Ftp.UploadFile;// 指定执行什么命令  
             reqFTP.UseBinary = true;// 指定数据传输类型  
+            reqFTP.UsePassive = true;
             reqFTP.ContentLength = fileInf.Length;// 上传文件时通知服务器文件的大小  
             int buffLength = 2048;// 缓冲大小设置为2kb  
             byte[] buff = new byte[buffLength];
@@ -45,9 +46,9 @@ namespace CallCenter.Utility
             FileStream fs = fileInf.OpenRead();
             try
             {
-                Stream strm = reqFTP.GetRequestStream();// 把上传的文件写入流  
-                contentLen = fs.Read(buff, 0, buffLength);// 每次读文件流的2kb  
-
+                res += uri+localFile;
+                Stream strm = reqFTP.GetRequestStream();// 把上传的文件写入流
+                contentLen = fs.Read(buff, 0, buffLength);// 每次读文件流的2kb 
                 while (contentLen != 0)// 流内容没有结束  
                 {
                     // 把内容从file stream 写入 upload stream  
@@ -61,7 +62,7 @@ namespace CallCenter.Utility
             }
             catch (Exception ex)
             {
-                res = "上传文件【" + ftpPath + "/" + fileInf.Name + "】时，发生错误：" + ex.Message + "<br/>";
+                res += "上传文件【" + ftpPath + "/" + fileInf.Name + "】时，发生错误：" + ex.Message + "<br/>。路径："+localFile;
             }
             return res;
         }