diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo index cfcb9e1f..15c953af 100644 Binary files a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo and b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo differ diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index d9cfa096..4df1e5b8 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -10,6 +10,7 @@ namespace BLL using System.Linq; using System.Net; using System.Reflection; + using System.Security.Cryptography; using System.Text; /// @@ -1281,6 +1282,25 @@ namespace BLL IRestResponse response = client.Execute(request); return response.Content; } + public static string GetMD5(string str) + { + using (MD5 md5 = MD5.Create()) + { + // 将输入字符串转换为字节数组并计算哈希值 + byte[] inputBytes = Encoding.ASCII.GetBytes(str); + byte[] hashBytes = md5.ComputeHash(inputBytes); + + // 将字节数组转换为十六进制字符串 + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < hashBytes.Length; i++) + { + sb.Append(hashBytes[i].ToString("X2")); + } + + return sb.ToString(); + } + + } } } diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx index 988bce95..f2e33906 100644 --- a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx +++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx @@ -1,4 +1,5 @@ 锘<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OnlineEditingPrivate.aspx.cs" Inherits="FineUIPro.Web.AttachFile.OnlineEditingPrivate" %> +<%@ Import Namespace="BLL" %> @@ -102,7 +103,7 @@ xhr.open(method, url, true); if (method === "POST") xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - xhr.setRequestHeader("token", "<%=this.CurrUser.UserId%>"); + xhr.setRequestHeader("token", "<%=this.CurrUser.UserId%>"); xhr.send(queryString); xhr.onreadystatechange = function () { if (xhr.readyState === 4) { @@ -158,8 +159,9 @@ type = "mobile"; } }; - // var urlString = "https://cloud.e-iceblue.cn/demo/sample.docx"; - var urlString = "<%=BLL.Funs.SGGLUrl%>" + "<%=PCUrl%>"; + // var urlString = "https://cloud.e-iceblue.cn/demo/sample.docx"; + <%-- //var urlString = "<%=BLL.Funs.SGGLUrl%>" + "<%=PCUrl%>";--%> + var urlString = "<%=urlString%>"; var arrfn = urlString.split("."); var strp = arrfn[arrfn.length - 1]; @@ -197,77 +199,77 @@ } docEditor = new SpireCloudEditor.OpenApi("iframeEditor", { - fileAttrs: { - fileInfo: { - name: '', - ext: '', - primary: urlString, - creator: '', - createTime: new Date('20210505') - }, - sourceUrl: urlString, - createUrl: '', - callbackUrl: '', ////This item can be empty, but only if the 'onSave' callback function must be defined in events. If the callback function is undefined and this item is empty, Cloud Editor will not provide save function. - verification: null, //鐢ㄦ埛鏂囦欢绯荤粺涓嬭浇鏂囦欢鏃惰嫢闇瑕侀獙璇佺被浼紅oken鐨勬暟鎹彲浠ュ啓鍦ㄨ繖閲 - canEdit: true + fileAttrs: { + fileInfo: { + name: '', + ext: '', + primary: '<%=urlStringMD5%>', + creator: '', + createTime: new Date('20210505') }, - templates:"", - whiteLabel:true, - user: { - primary: '', - name: '<%=this.CurrUser.UserName%>', - canSave: true, - customization: { - public: { - common: { - whiteLabel: true, - defaultZoom: 1, - openReviewChanges: false, - permGroups: ['everyone'], //闄愬埗缂栬緫鍒嗙粍 - viewVersion: false, - header: { - hideTitle: false, - defaultView: 'full' - } - }, - word: null, //doc瀹氬埗 - powerpoint: null, //ppt瀹氬埗 - excel: null //xls瀹氬埗 + sourceUrl: urlString, + createUrl: '', + callbackUrl: '', ////This item can be empty, but only if the 'onSave' callback function must be defined in events. If the callback function is undefined and this item is empty, Cloud Editor will not provide save function. + verification: null, //鐢ㄦ埛鏂囦欢绯荤粺涓嬭浇鏂囦欢鏃惰嫢闇瑕侀獙璇佺被浼紅oken鐨勬暟鎹彲浠ュ啓鍦ㄨ繖閲 + canEdit: true + }, + templates: "", + whiteLabel: true, + user: { + primary: '', + name: '<%=this.CurrUser.UserName%>', + canSave: true, + customization: { + public: { + common: { + whiteLabel: true, + defaultZoom: 1, + openReviewChanges: false, + permGroups: ['everyone'], //闄愬埗缂栬緫鍒嗙粍 + viewVersion: false, + header: { + hideTitle: false, + defaultView: 'full' + } }, - "private": { - "token": null, - "appid": null, - "appkey": null - } - } - }, - editorAttrs: { //缂栬緫鍣ㄩ厤缃 - editorWidth: '100%', - editorHeight: '100%', - editorMode: '<%=editorMode%>', - editorType: 'document', //缂栬緫鍣ㄧ被鍨嬶紝鍙笉閰嶇疆锛岀▼搴忔牴鎹枃浠剁被鍨嬭幏鍙栵紝缁撴灉涓 document,presentation,spreadsheet - platform: 'windows', //缂栬緫鍣ㄥ钩鍙扮被鍨嬶紝鍙墂indows锛 mobile锛 embedded - viewLanguage: 'zh', //骞冲彴鐣岄潰灞曠ず璇█鍙塭n/zh - canChat: true, //鏄惁鍙亰澶 - canComment: true, //鏄惁鍙壒娉 - canReview: true, - canDownload: true, - canForcesave: true, - embedded: { - saveUrl: '', - embedUrl: '', - shareUrl: '' + word: null, //doc瀹氬埗 + powerpoint: null, //ppt瀹氬埗 + excel: null //xls瀹氬埗 }, - events: { - 'onReady': onReady, - 'onDocumentStateChange': onDocumentStateChange, - 'onError': onError, - 'onRequestEditRights': onRequestEditRights, - 'onOutdatedVersion': onOutdatedVersion, - 'onSave': callbackfn + "private": { + "token": null, + "appid": null, + "appkey": null } } }, + editorAttrs: { //缂栬緫鍣ㄩ厤缃 + editorWidth: '100%', + editorHeight: '100%', + editorMode: '<%=editorMode%>', + editorType: 'document', //缂栬緫鍣ㄧ被鍨嬶紝鍙笉閰嶇疆锛岀▼搴忔牴鎹枃浠剁被鍨嬭幏鍙栵紝缁撴灉涓 document,presentation,spreadsheet + platform: 'windows', //缂栬緫鍣ㄥ钩鍙扮被鍨嬶紝鍙墂indows锛 mobile锛 embedded + viewLanguage: 'zh', //骞冲彴鐣岄潰灞曠ず璇█鍙塭n/zh + canChat: true, //鏄惁鍙亰澶 + canComment: true, //鏄惁鍙壒娉 + canReview: true, + canDownload: true, + canForcesave: true, + embedded: { + saveUrl: '', + embedUrl: '', + shareUrl: '' + }, + events: { + 'onReady': onReady, + 'onDocumentStateChange': onDocumentStateChange, + 'onError': onError, + 'onRequestEditRights': onRequestEditRights, + 'onOutdatedVersion': onOutdatedVersion, + 'onSave': callbackfn + } + } + }, appid, appkey ); diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs index b37339d9..78b061e3 100644 --- a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs @@ -11,7 +11,7 @@ namespace FineUIPro.Web.AttachFile public partial class OnlineEditingPrivate : PageBase { #region 瀹氫箟鍙傛暟 - + public string CallBackUrl { get @@ -60,6 +60,8 @@ namespace FineUIPro.Web.AttachFile ViewState["editorMode"] = value; } } + public string urlString = String.Empty; + public string urlStringMD5 = String.Empty; #endregion protected void Page_Load(object sender, EventArgs e) @@ -72,7 +74,8 @@ namespace FineUIPro.Web.AttachFile PCUrl = Request.Params["fileUrl"]; editorMode = Request.Params["editorMode"]; - + urlString = Funs.SGGLUrl + PCUrl; + urlStringMD5 = Funs.GetMD5(urlString); } } }