diff --git a/插件库/Lskj.PubBrower/FrmMain.cs b/插件库/Lskj.PubBrower/FrmMain.cs index e053861..aabdfdd 100644 --- a/插件库/Lskj.PubBrower/FrmMain.cs +++ b/插件库/Lskj.PubBrower/FrmMain.cs @@ -68,6 +68,10 @@ namespace Lskj.PubBrower //url = ReplaceHelper.ReplaceIPersonnel(url, SystemInfo.Instance.iPersonnelAllowInformation, SystemInfo.Instance.iPersonnelCustomerId, SystemInfo.Instance.iPersonnelPrivateKey); url = PersonnelReplaceHelper.UrlEncryption(url, SystemInfo.Instance.iPersonnelAllowInformation, SystemInfo.Instance.iPersonnelCustomerId, SystemInfo.Instance.iPersonnelPrivateKey, ERPInfo.Instance.UserLinkPhone); } + if (url.Contains("{CDSBLimsLoginNo}")) + { + url = PersonnelReplaceHelper.CDSBLimsUrlEncryption(url, ERPInfo.Instance.LoginAccount, SystemInfo.Instance.CDSBLimsPrivateKey); + } bool downLoadFlag = this.PubBrowerModel.downLoadFlag == 1; int RightKeyFlag = this.PubBrowerModel.RightKeyFlag; @@ -146,22 +150,4 @@ namespace Lskj.PubBrower FrmSelectDownload frmSelectDownload = new FrmSelectDownload(); frmSelectDownload.URL = URL; frmSelectDownload.FileName = FileName; - frmSelectDownload.isBatchDownLoad = isBatchBrower; - // frmSelectDownload.TopMost = true; - frmSelectDownload.ShowDialog(); - //SaveFileDialog saveFileDialog = new SaveFileDialog(); - //saveFileDialog.FileName = FileName; - //saveFileDialog.Title = "下载模板文件到"; - //saveFileDialog.RestoreDirectory = true; - ////点了保存按钮进入 - //if (saveFileDialog.ShowDialog() == DialogResult.OK) - //{ - // string localFilePath = System.IO.Path.GetFullPath(saveFileDialog.FileName);//获得文件路径,含文件名 - // string fileNameExt = localFilePath.Substring(localFilePath.LastIndexOf("\\") + 1);//获取文件名,不带路径 - // string FilePath = localFilePath.Substring(0, localFilePath.LastIndexOf("\\"));//获取文件路径,不带文件名 - // FrmDownload frm = new FrmDownload(URL, FileName, localFilePath); - // frm.Show(); - //} - } - } -} + frmSelectDownload.isBatchDownLoad = isBa \ No newline at end of file diff --git a/插件库/Lskj.PubBrower/Lskj.PubBrower.csproj b/插件库/Lskj.PubBrower/Lskj.PubBrower.csproj index e577d73..f7a8843 100644 --- a/插件库/Lskj.PubBrower/Lskj.PubBrower.csproj +++ b/插件库/Lskj.PubBrower/Lskj.PubBrower.csproj @@ -44,12 +44,15 @@ + + +