diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index ec046d44..7357a44c 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -66,7 +66,7 @@ namespace BLL /// /// 五环OA 私钥 /// - public const string OAPrivateKey_CWCEC = "nq6pYDFkcrpzVtMrLbf2dvDPs2FDo5yeDub6YCnl0hXov3MVEVMbVe3NCnC5Thl3dwm14yI9/vNIGdH5M4getAkMnkG8tNA60NPjtHUzyoZSpVYCUOmB30s5vx+4IBkPh8R4ynkJYyUxkl61/0h6y7A86qz4jNivxAKt2a0vQxk=AQABy/DiC9r3AfTlJzuwk2BBT3X2YpVN0LE/lUIHJs64GW2siQow/k9BRcPOkBwLuVOp/YrwYPCh/XGLxjukqxCjNw==xzA32jeRGMthXVbkmn0YvFKV6O9IS7Toee2cRN8x1qRPwwnN5yOq7lunMcZyWLfCimsKmYwRe9Uw5fHMPScULw==DIzRTEt4Qd2RMH3i2t7khgBLXjuz4zDVKdk7WW8FM0Nlh7Vh2HSGHsXy8zlWm1wDrP+c1UpZnaAcKuHGu2Q1tw==jFW3dAHkM0DPFzDqHMH4FG5m+dbj65rIk2bJy2got93J6FLXA3sIqahfMl1rIIBPCrCBpk6d3s4EBm2GBKustw==ux8JAVqXtCjtaNgahpa0AK73tp+kGEkHyvt/hzp8C8LmXicNGNZtgDDHHLwxN+Lzp3z6ThfzY44oQtymljRu1g==Ye2Oj9PLltYkKhgmFI/sZZjVxXEoKgeUr8OyDrisoUtuGQCvpsJwI0affGr2oREsXeU7P9I5CmcfPvgLX9cIgsAtOcDMM81Hs6WhfbkryjyFj1CfKTI9gYZnApPInYYMew8wvUX23K6Hq+rIyHxMnSAhLvoqXor4KVQj6QRtdOU="; + public const string OAPrivateKey_CWCEC = "1oowM965L1r9NM10IruHI+4v4cF8cMrZ1PMaG/D1oNOww8YGEYjKiQ2iAjAtJi4OQX6sxI7BHJad/CGNKeE12ywplO18J8vL/YvEq38DMen22ungNAjSmC6zmIngvBrIiyW2Cyws/9JQKxT02I1tZlEQ9q4ZxCc3PLFazTD0sIk=AQAB

2K+KCTgEGJAvPzB6pYcDmE2n/gIIy6dOiaNQtTWRUrttC+DaU8ZlORlYH6+lWcekYhGnf+dVjfuGE3w45JVKxw==

/Xb6T/4tizVbVpjLd47SN+c1yEcCubLhv7HHd/9E2K5olboWvOGxUbr53F4FOmTu9CWpybbCKLReJWPQxq5aLw==eA1Ztx3X9xv7cVEUwpz5OurbhnnuEZdShiN71comB+Zb1lbv37Zt4qLOFlAklodr5gHOAalT12Rhtm3+v3aPhQ==5VjUNK+1PEKijGAjs+I627TN2JRQpgFz/gX6jN0hycM/BURmMLEzxtWeI0W8C1OrWKX/1XMWishya/i+wBihpw==wE16uAx/ztTMObpArwC2eGhh+oCwXsnUPoFSQtLHeEbxx/Cf424wKr2ceV/Fe9YKQp5XLdOpJkCDDAF+2k4X1A==0rF/yVEQeQtY5ERpq7qTa5v99i448eSlrVbZ61rnP3zmej29s/atQY/b7V422OoeIgAv2BGCYXshyH2CzwBYDAtGkz+qvaZtPvWIYPadTvgU5W/QgX8r/ozqFBHu17APSSBmJWulShxj6r9kOmgxW4HzwVQ/iQgyQ5Z+qgpf50k="; #endregion #region 按钮描述 diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 654dca1a..12e6ee53 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1137,9 +1137,13 @@ namespace BLL /// /// /// - public static DateTime IntToDateTime(int timestamp) + public static DateTime IntToDateTime(long timestamp) { - return TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(timestamp); + var date = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); + date = date.AddMilliseconds(timestamp); + return date; + + //return TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(timestamp); } } } diff --git a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs index a3649658..877a32c2 100644 --- a/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs +++ b/SGGL/BLL/ZHGL/RealName/SynchroSetService.cs @@ -982,7 +982,7 @@ namespace BLL idcardNumber = x.IdentityCard, idcardStartDate = x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate) : null, idcardEndDate = x.IdcardEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate) : null, - idcardForever = x.IdcardForever, + idcardForever = "Y", politicsStatus = x.PoliticsStatus, eduLevel = x.EduLevel, maritalStatus = x.MaritalStatus, @@ -1112,7 +1112,7 @@ namespace BLL idcardNumber = x.IdentityCard, idcardStartDate = x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate) : null, idcardEndDate = x.IdcardEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate) : null, - idcardForever = x.IdcardForever, + idcardForever = "Y", politicsStatus = x.PoliticsStatus, eduLevel = x.EduLevel, maritalStatus = x.MaritalStatus, @@ -1469,7 +1469,7 @@ namespace BLL idcardNumber = x.IdentityCard, idcardStartDate = x.IdcardStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate) : null, idcardEndDate = x.IdcardEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate) : null, - idcardForever = x.IdcardForever, + idcardForever = "Y", politicsStatus = x.PoliticsStatus, eduLevel = x.EduLevel, maritalStatus = x.MaritalStatus, diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e305653b..5f282702 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,166 +1 @@ - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.GetButtonPower() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 2297 - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 24 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 10:28:56 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 - -出错时间:09/23/2021 10:28:56 - - - -错误信息开始=====> -错误类型:SqlException -错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.ExecuteReader() - 在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult) - 在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\OpenService\GetDataService.cs:行号 139 - 在 BLL.MonitorService.DoSynchData() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\OpenService\MonitorService.cs:行号 2180 - 在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\OpenService\MonitorService.cs:行号 112 -----错误类型:Win32Exception -----错误信息: -----等待的操作过时。 -----错误堆栈: - 出错时间:09/23/2021 11:18:10 -出错时间:09/23/2021 11:18:11 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 332 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:20:19 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:20:19 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 332 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:21:00 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:21:00 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 332 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:21:01 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:21:01 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 332 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:21:02 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:21:02 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 334 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:23:22 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:23:22 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.JDGL.WBS.WBSSetAudit.trWBS_NodeCheck(Object sender, TreeCheckEventArgs e) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\FineUIPro.Web\JDGL\WBS\WBSSetAudit.aspx.cs:行号 334 - 在 FineUIPro.Tree.OnNodeCheck(TreeCheckEventArgs e) - 在 (Tree , TreeCheckEventArgs ) - 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/23/2021 11:23:42 -出错文件:http://localhost:8118/JDGL/WBS/WBSSetAudit.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/23/2021 11:23:42 - + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Login.aspx.cs b/SGGL/FineUIPro.Web/Login.aspx.cs index b9d06940..6ef49a7b 100644 --- a/SGGL/FineUIPro.Web/Login.aspx.cs +++ b/SGGL/FineUIPro.Web/Login.aspx.cs @@ -2,11 +2,8 @@ { using BLL; using System; - using System.Configuration; - using System.Linq; using System.Security.Cryptography; using System.Text; - using System.Web; using System.Web.Services; public partial class Login : PageBase @@ -70,28 +67,42 @@ string userdata = Request.Params["basedata"]; if (!string.IsNullOrEmpty(userdata)) { - string result = RSADecrypt(Const.OAPrivateKey_CWCEC, userdata); //经过RSA解密后获得的域登录名+时间戳 - if (!string.IsNullOrEmpty(result)) + try { - var value = Funs.GetStrListByStr(result, '|'); - if (value.Count > 1) + string result = RSADecrypt(Const.OAPrivateKey_CWCEC, userdata); //经过RSA解密后获得的域登录名+时间戳 + if (!string.IsNullOrEmpty(result)) { - var userValues = Funs.GetStrListByStr(value[0], '='); - var timespan = Funs.GetStrListByStr(value[1], '='); - if (userValues.Count > 1 && timespan.Count > 1) + var value = Funs.GetStrListByStr(result, '&'); + if (value.Count > 1) { - DateTime? dateTimeS = Funs.IntToDateTime(Funs.GetNewIntOrZero(timespan[1])); - if (dateTimeS.HasValue && DateTime.Now.AddSeconds(-30) < dateTimeS) + var userValues = Funs.GetStrListByStr(value[0], '='); + var timespan = Funs.GetStrListByStr(value[1], '='); + if (userValues.Count > 1 && timespan.Count > 1 && timespan[1] != null) { - if (LoginService.UserLogOn_OA(userValues[1], true, this.Page)) + TimeSpan ts = DateTime.Now- new DateTime(1970, 1, 1, 0, 0, 0, 0); + //DateTime time = Funs.IntToDateTime(Convert.ToInt64(timespan[1])); + //if (DateTime.Now < time.AddSeconds(10)) //时间间隔小于10秒 + if (Convert.ToInt64(ts.TotalMilliseconds) - Convert.ToInt64(timespan[1]) < 600000) { - string url = getUrl(); - Response.Redirect(url); + if (LoginService.UserLogOn_OA(userValues[1], true, this.Page)) + { + string url = getUrl(); + Response.Redirect(url); + } + } + else + { + Alert.ShowInTop("时间戳过期！", MessageBoxIcon.Warning); } } } } } + catch (Exception ex) + { + //ErrLogInfo.WriteLog("OA单点登陆", ex); + //Alert.ShowInParent(ex.Message, MessageBoxIcon.Error); + } } } } diff --git a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs index ef06ef1c..ff533b41 100644 --- a/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; +using BLL; +using System; using System.Linq; -using System.Net; -using System.Net.Http; using System.Web.Http; -using BLL; + namespace WebAPI.Controllers { /// diff --git a/开发需求/OA对接密钥.txt b/开发需求/OA对接密钥.txt index 02c0d16f..10cc8999 100644 --- a/开发需求/OA对接密钥.txt +++ b/开发需求/OA对接密钥.txt @@ -3,5 +3,6 @@ publickey rnq6pYDFkcrpzVtMrLbf2dvDPs2FDo5yeDub6YCnl0hXov3MVEVMbVe3NCnC5Thl3dwm14yI9/vNIGdH5M4getAkMnkG8tNA60NPjtHUzyoZSpVYCUOmB30s5vx+4IBkPh8R4ynkJYyUxkl61/0h6y7A86qz4jNivxAKt2a0vQxk=AQAB -privatekey：nq6pYDFkcrpzVtMrLbf2dvDPs2FDo5yeDub6YCnl0hXov3MVEVMbVe3NCnC5Thl3dwm14yI9/vNIGdH5M4getAkMnkG8tNA60NPjtHUzyoZSpVYCUOmB30s5vx+4IBkPh8R4ynkJYyUxkl61/0h6y7A86qz4jNivxAKt2a0vQxk=AQAB -y/DiC9r3AfTlJzuwk2BBT3X2YpVN0LE/lUIHJs64GW2siQow/k9BRcPOkBwLuVOp/YrwYPCh/XGLxjukqxCjNw==xzA32jeRGMthXVbkmn0YvFKV6O9IS7Toee2cRN8x1qRPwwnN5yOq7lunMcZyWLfCimsKmYwRe9Uw5fHMPScULw==DIzRTEt4Qd2RMH3i2t7khgBLXjuz4zDVKdk7WW8FM0Nlh7Vh2HSGHsXy8zlWm1wDrP+c1UpZnaAcKuHGu2Q1tw==jFW3dAHkM0DPFzDqHMH4FG5m+dbj65rIk2bJy2got93J6FLXA3sIqahfMl1rIIBPCrCBpk6d3s4EBm2GBKustw==ux8JAVqXtCjtaNgahpa0AK73tp+kGEkHyvt/hzp8C8LmXicNGNZtgDDHHLwxN+Lzp3z6ThfzY44oQtymljRu1g==Ye2Oj9PLltYkKhgmFI/sZZjVxXEoKgeUr8OyDrisoUtuGQCvpsJwI0affGr2oREsXeU7P9I5CmcfPvgLX9cIgsAtOcDMM81Hs6WhfbkryjyFj1CfKTI9gYZnApPInYYMew8wvUX23K6Hq+rIyHxMnSAhLvoqXor4KVQj6QRtdOU= \ No newline at end of file +privatekey： + +1oowM965L1r9NM10IruHI+4v4cF8cMrZ1PMaG/D1oNOww8YGEYjKiQ2iAjAtJi4OQX6sxI7BHJad/CGNKeE12ywplO18J8vL/YvEq38DMen22ungNAjSmC6zmIngvBrIiyW2Cyws/9JQKxT02I1tZlEQ9q4ZxCc3PLFazTD0sIk=AQAB

2K+KCTgEGJAvPzB6pYcDmE2n/gIIy6dOiaNQtTWRUrttC+DaU8ZlORlYH6+lWcekYhGnf+dVjfuGE3w45JVKxw==

/Xb6T/4tizVbVpjLd47SN+c1yEcCubLhv7HHd/9E2K5olboWvOGxUbr53F4FOmTu9CWpybbCKLReJWPQxq5aLw==eA1Ztx3X9xv7cVEUwpz5OurbhnnuEZdShiN71comB+Zb1lbv37Zt4qLOFlAklodr5gHOAalT12Rhtm3+v3aPhQ==5VjUNK+1PEKijGAjs+I627TN2JRQpgFz/gX6jN0hycM/BURmMLEzxtWeI0W8C1OrWKX/1XMWishya/i+wBihpw==wE16uAx/ztTMObpArwC2eGhh+oCwXsnUPoFSQtLHeEbxx/Cf424wKr2ceV/Fe9YKQp5XLdOpJkCDDAF+2k4X1A==0rF/yVEQeQtY5ERpq7qTa5v99i448eSlrVbZ61rnP3zmej29s/atQY/b7V422OoeIgAv2BGCYXshyH2CzwBYDAtGkz+qvaZtPvWIYPadTvgU5W/QgX8r/ozqFBHu17APSSBmJWulShxj6r9kOmgxW4HzwVQ/iQgyQ5Z+qgpf50k= \ No newline at end of file