diff --git a/Bin/ChangeLog.txt b/Bin/ChangeLog.txt index 5b80e7ef480dc9a74c025b39d47f5907d27d5fe6..abf5a944c48229a412dc1ab15e8e9e6a7ec7681c 100644 --- a/Bin/ChangeLog.txt +++ b/Bin/ChangeLog.txt @@ -1,21 +1,26 @@ -2021-10-25 PluginOK升级网络版2.2.3.2(单机版1.5.3.2) - 1、优化小程序及浏览器退出逻辑，增加强制杀小程序等待时间配置； - 2、优化网页刷新后重新加载高级版内嵌小程序的性能； - 3、解决某些情况下关闭小程序或退出浏览器时提示运行崩溃问题； - 4、解决系统返回错误描述有回车换行时返回的JSON包无法解析问题； - 5、解决切换标签或恢复显示时，充满网页区显示可能错位问题； - 6、解决局域网电脑数量较多时获取路由器MAC地址失败问题； - 7、解决VLC网页播放小程序因临时路径错误导致的抓图失败问题； - 8、VLC网页播放小程序文字描述的播放状态支持前端设置和取消显示，支持设置字体名称和字体大小。 +2021-11-03 PluginOK升级网络版2.2.3.3(单机版1.5.3.3) + 1、前端调用提供VUE框架写的集成代码，以VLC网页播放小程序为例实现自动播放等功能演示； + 2、优化升级中间件时是否关闭浏览器的逻辑； + 3、优化正式版网络授权未更新到授权时的提示信息； + 4、解决启动内嵌小程序的rid参数和返回的事件通知中不匹配问题； + 5、解决页面中滚动结束时内嵌小程序位置错误问题； + 6、Office网页小程序增加指定书签名称合并指定文件中内容； + 7、VLC网页播放小程序增加3路播放窗口并列的风格。 -2021-10-18 PluginOK升级网络版2.2.3.1(单机版1.5.3.1) +2021-10-25 PluginOK升级网络版2.2.3.2(单机版1.5.3.2) 1、切换文件签名证书、完成对Windows 11正式版兼容性测试； - 2、解决个别电脑启动内嵌小程序提示挂钩失败问题； - 3、解决个别电脑网络版更新授权可能不执行问题； - 4、VLC网页播放小程序增加文字描述的播放状态显示，正常播放后自动消失； - 5、VLC网页播放小程序支持获取或设置视频流相关信息，切换播放改到线程中执行避免卡顿； - 6、VLC网页播放小程序默认配置增加背景色和事件通知的过滤码，颜色支持#000000格式； - 7、Office网页小程序支持加载永中Office专业版，前端支持请求金山WPS小程序输出为OFD(国家版式文档格式标准)版式文件。 + 2、优化小程序及浏览器退出逻辑，增加强制杀小程序等待时间配置，解决可能退出时的崩溃问题； + 3、优化网页刷新后重新加载高级版内嵌小程序的性能； + 4、解决个别电脑启动内嵌小程序提示挂钩失败问题； + 5、解决个别电脑网络版更新授权可能不执行问题； + 6、解决切换标签或恢复显示时，充满网页区显示可能错位问题； + 7、解决局域网电脑数量较多时获取路由器MAC地址失败问题； + 8、解决VLC网页播放小程序因临时路径错误导致的抓图失败问题； + 9、VLC网页播放小程序增加文字描述的播放状态显示，正常播放后自动消失； + 10、VLC网页播放小程序支持获取或设置视频流相关信息，切换播放改到线程中执行避免卡顿； + 11、VLC网页播放小程序默认配置增加背景色和事件通知的过滤码，颜色支持#000000格式； + 12、VLC网页播放小程序文字描述的播放状态支持前端设置和取消显示，支持设置字体名称和字体大小； + 13、Office网页小程序支持加载永中Office专业版，前端支持请求金山WPS小程序输出为OFD(国家版式文档格式标准)版式文件。 2021-09-30 PluginOK升级网络版2.2.2.1(单机版1.5.2.1) 1、改进中间件数据存储和访问机制，优化内嵌小程序启动速度； diff --git a/Bin/FileApplet.txt b/Bin/FileApplet.txt index f7f928f161b767d80db6e178f16ed7e61eedb4d2..69469120b04affe28b6bb46631d5183b02ac340f 100644 --- a/Bin/FileApplet.txt +++ b/Bin/FileApplet.txt @@ -7,11 +7,11 @@ 2װļСڲҳ ws://localhost:80?sid=123&flag=1 мȻݵͣ -{"req":"Plugin_Install","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-10-18","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet.pid","MD5":"7EA59AA808F003A3D4C68C1321A58F70","Version":"1.5.3.1","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"3F43D7975C8E0410307FAFE9A34ED4B7D8F8F0A35E8CF43D571759C9726324671E9FB83F1B3EE1A6E4C83E3B3012EEB472CB414002D9DC66A2DA7B62123A73F0E28F0D10624229AB8242023A602FC6AF68F7ADB3FFB6E173F8F9DDE98327B9645C9408F580F57A4C29248C5D21250BFD22B30E43324DBDC51277EF2CFCCC1FB33755F981A6C9ADD9EDF8C4AFB71C57C675AB997CE4369632D5BC76851C78C6258A3CD73AAFE821172A6B4BACCA4D3E0DBD74916A6452BAF59B532C516C180AE5E8CA8367CCABAA896EE4ECE8C81D3A564231C434BCA610B7034A7AC775AD2B02E3FA89E78C64F6DBEE01035D4B0B951565658A4C6C8423A4132AFD0E8911B37D"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-11-03","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet.pid","MD5":"D9AC1402243A389E9C7DCD6ADDE72824","Version":"1.5.3.3","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"4C0B10B5A42B3FD94E42B0BB5EEA937BF06EE1323CC588F97B83F4E685D4D1B57D61D40B3932C032175B219B8DC7EE36E973C0170D331AE6F4FB7C2997A46BE2EE0A5AB185104CA6B4C988E43648F65DAEC55C38ABA99E02C8FA061A5CDA103579891FD28A293CB5189064F2332E6DC77DEE9EA2F3E1C233761D555E389FD4DA18F1D68716712840FFE3E8BEE8E6161FE6E5557EF74C8C4578671A5C8BF02CB37A9595E6DACFAE97A3CAC1EF784A4909BBFF612B300B92A35D8D2099BAA9D543F2EBF280A67C0D0F8B7C185B1A67C4864E16C4231D83537FAEC3231A4FF9ED875C274A826F21F39D402FA50E202DB1333DD996E29220189CCF50C2C339EF1246"}} 3ļС -{"req":"Plugin_Update","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-10-18","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet_Update.pid","MD5":"315FD6BC6429362CB7C19F61892A54DC","Version":"1.5.3.1","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"7B49EE8757D63FA0C51CA96BC1F4C72F8FFE50FBCBD74EBD11140FA0CE701F7133ACEB66F96280C13DDFC3C65E29C7C3FF4F224CA1BA35DB74FC4BA5B4CD909411E8A82C0932165CCA2D078DCA4CBA452C33EA28231AC99DEBD6CF27FD7A71DE460BD31AFEC8309588320E562F92030E1C483BF5EEF59766293C78A0C78227BB882FEA378692E52E556A396244D1ACF3E8EEC53BDCB31589945C902599A6FA5159F84F5AEAFA2D23373D4B9B842BB38D3EB39C6984776DF2DF76FE0686B75FBA4D2D89F3DE08B2FED1322D9791DB894E693AFA9ADBD86004B769E67AAE1E7B49C3656DF8AA9FDF21DE8FDA3F2D0ED90D40245A99D6377F8CE210B999DBFEDC91"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-11-03","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Plugin/WrlFileApplet_Update.pid","MD5":"9DA78F6CDDA0C5EE55D499FC850C7ABB","Version":"1.5.3.3","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"961694F714F2E1B7EA275061022EB40EA8B87FCB8AA323AA4AE67225B94342619B7D844EA3D5EF88BEB29317022CDD9E232EFF86BE26D1E474653305F705ADB6E746273FB9FC71C498647CBF59B66A0C52F763BFBD05220153A8BC9B8008073EB8D8238E49552F98EEF37736B6A26193FFA762737BA484EE7942502753705895863D7D46A3A5CCBDD266F8D788F808611CE9D660B70FF48F429115E99FEC853E58E71457B2D83B38D31EA033027826D44A4CF36A15E8146D8B4559C8F786DA4C9E525224720E1E49664D8FF74BCCCD0EC9B5D426809C1025AEEC928F3094E5CB5007D69916604056D6A53E9D86CC2FA2B4641334E457FDF9459D9A323F8C5D6D"}} ϰװJSON汾ݲͬװʱϵͷȡµ diff --git a/Bin/PluginOK.pdf b/Bin/PluginOK.pdf index 69eb37776ff4f9617f7d4d4a6ea19fbb1237979b..2670a48510cd8d1c5f94de1fc0b404db6ba8f1e1 100644 Binary files a/Bin/PluginOK.pdf and b/Bin/PluginOK.pdf differ diff --git a/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf b/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf index 8626706aa2c79339343df78bb737c9e3a4b0d91a..229fcc214279860487b349a8a32de2591930688a 100644 Binary files a/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf and b/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf differ diff --git a/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll b/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll index 6ef0c85b3f0841ffb9fc825c8f43c6717eeed19e..eb67f349be24f1288b9de047fef51d960d3c3e7b 100644 Binary files a/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll and b/Bin/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll differ diff --git a/Bin/TestWrl.txt b/Bin/TestWrl.txt index 8134ab7ef7a1262de6876f3c0023460d7f0f7699..1a5f6010574d72ae58233b0a56d5616be316a807 100644 --- a/Bin/TestWrl.txt +++ b/Bin/TestWrl.txt @@ -168,7 +168,7 @@ Monitor 4PluginOK(ţ)м 1)м -{"req":"Wrl_Update","rid":1,"para":{"Name":"PluginOK","Date":"2021-10-25","Desc":"1лļǩ֤顢ɶWindows 11ʽԲԣ2ŻмС˳ƣ˳ܱ⣻3ŻˢҳǶСܣǶСʾҹʧ⣻4VLCҳСOfficeС...","DownAddr":"http://local.zorrosoft.com/Files/Update/Wrl_Update.pid","MD5":"C3EFF49B8325665FA0AF92ABC2E17D27","Version":"1.5.3.2","Size":14286848,"HideIns":0,"Cookie":"","Auth":"","TK":"5C781DD52C83EC1C516554799ED3DF91A6A7376B55ECCA52770BC2CBA64625F6E3A6663A3292FDD0D4551FED8CA9928DDB78100F0EC2CD50A773078BAB0D8191EAA53FA1632BE4C5593B6A44EB236E157E67440056ADC0FF4329F1EC80CE0A46E9A4CA8F335DD303F1E7510F469C72EDD81B826B599E08EA11650B698604FC634215F54CB26F8EBB1DC076BBAD04A1182FDCA0C2AC611CEC5B001331A498103696E8B593514D9BB8D8905C1BB62D399A5AB708AFC8E6174EB795512348E0AE15A566C969C31723E8EE605E6C793BF14F82B83BABFDFA176AFC0AE9801EAC033CAE72EAC9037482BD917085DDC41DB8BE4C7B335C1BC39E8F24256FEB8B40B102"}} +{"req":"Wrl_Update","rid":1,"para":{"Name":"PluginOK","Date":"2021-11-03","Desc":"1лļǩ֤顢ɶWindows 11ʽԲԣ2ŻмС˳ƣ˳ܱ⣻3ŻˢҳǶСܣǶСʾҹʧ⣻4VLCҳСOfficeС...","DownAddr":"http://local.zorrosoft.com/Files/Update/Wrl_Update.pid","MD5":"F53DE555BBBACDD28D10ED7DD68A4908","Version":"1.5.3.3","Size":11239424,"HideIns":0,"Cookie":"","Auth":"","TK":"1BC88C6A9D847B6C03D862FE7281F9B906B924708840DFDE094A2AAC2992DA78D4FCB0E4150285C3B1B6FBF6DC94691F124078C2DBED0D0AA0D9009AEEE0055EBD45D4F92845EB5E98F85AA3E46803543A2266A84AD6BBA93742E5CD5C286183CCE54D98F7B41B31DC6E6DF4C2D380FC70F34BE69C8ED6920FBE37FB95B90335609C6617B5AC40CFFB9D95D4EDE5775B45230C7DA128D8C805AA4F596FB14726C7CF9BDD06872D6B164ECAD7253AF8A1B789A9A27629B1F31D2E2B47514C165D15C0D3D9FB761BE6340BD7C0DA27A99664ECF0273EA23D5B06BA921BF833CAE8697C30F3946E9D5EEE9605A669718B58D997A639B1E374D9932F62E51B669E0D"}} 2)мȨ мȨļԷŵЭнҲԵָ diff --git a/Bin/WrlAgent.exe b/Bin/WrlAgent.exe index 677d5d42373e5b90cc8099792db9f74bbc5e281a..c2eda44e7fa51c815c7228370e5de3846b1ecfec 100644 Binary files a/Bin/WrlAgent.exe and b/Bin/WrlAgent.exe differ diff --git a/Bin/WrlBase.dll b/Bin/WrlBase.dll index 32865200439d65db91b7a121dddcf32480ce76a8..76454e15e774621e1701c99de870a27acb684876 100644 Binary files a/Bin/WrlBase.dll and b/Bin/WrlBase.dll differ diff --git a/Bin/WrlEngine.dll b/Bin/WrlEngine.dll index 703dac9fbccde15fa92c9c3895ad05112a483303..35d2ad9f12dd44fea81606f014fb16b43fb5b79e 100644 Binary files a/Bin/WrlEngine.dll and b/Bin/WrlEngine.dll differ diff --git a/Bin/WrlHttp.dll b/Bin/WrlHttp.dll index 272a02b5e8946e04663d14e96baf04e8247a44dc..db928bb88e2c431e7c6edad54ebcf3e312d5a8be 100644 Binary files a/Bin/WrlHttp.dll and b/Bin/WrlHttp.dll differ diff --git a/Bin/WrlService.exe b/Bin/WrlService.exe index a02dd28b32e6f9d2af111e8c6f24c9b6c765cd90..5dfaf6e486d14a6fca7cc85d15fda9dfdbe2b0b4 100644 Binary files a/Bin/WrlService.exe and b/Bin/WrlService.exe differ diff --git a/Bin/WrlSetup.exe b/Bin/WrlSetup.exe index 62fb7ea8fc5948c8c70aa2c6a8cb906a3b28c175..adaffed370734fcd22c6b1be26a2257f612b35e0 100644 Binary files a/Bin/WrlSetup.exe and b/Bin/WrlSetup.exe differ diff --git a/Net/ChangeLog.txt b/Net/ChangeLog.txt index 5b80e7ef480dc9a74c025b39d47f5907d27d5fe6..abf5a944c48229a412dc1ab15e8e9e6a7ec7681c 100644 --- a/Net/ChangeLog.txt +++ b/Net/ChangeLog.txt @@ -1,21 +1,26 @@ -2021-10-25 PluginOK升级网络版2.2.3.2(单机版1.5.3.2) - 1、优化小程序及浏览器退出逻辑，增加强制杀小程序等待时间配置； - 2、优化网页刷新后重新加载高级版内嵌小程序的性能； - 3、解决某些情况下关闭小程序或退出浏览器时提示运行崩溃问题； - 4、解决系统返回错误描述有回车换行时返回的JSON包无法解析问题； - 5、解决切换标签或恢复显示时，充满网页区显示可能错位问题； - 6、解决局域网电脑数量较多时获取路由器MAC地址失败问题； - 7、解决VLC网页播放小程序因临时路径错误导致的抓图失败问题； - 8、VLC网页播放小程序文字描述的播放状态支持前端设置和取消显示，支持设置字体名称和字体大小。 +2021-11-03 PluginOK升级网络版2.2.3.3(单机版1.5.3.3) + 1、前端调用提供VUE框架写的集成代码，以VLC网页播放小程序为例实现自动播放等功能演示； + 2、优化升级中间件时是否关闭浏览器的逻辑； + 3、优化正式版网络授权未更新到授权时的提示信息； + 4、解决启动内嵌小程序的rid参数和返回的事件通知中不匹配问题； + 5、解决页面中滚动结束时内嵌小程序位置错误问题； + 6、Office网页小程序增加指定书签名称合并指定文件中内容； + 7、VLC网页播放小程序增加3路播放窗口并列的风格。 -2021-10-18 PluginOK升级网络版2.2.3.1(单机版1.5.3.1) +2021-10-25 PluginOK升级网络版2.2.3.2(单机版1.5.3.2) 1、切换文件签名证书、完成对Windows 11正式版兼容性测试； - 2、解决个别电脑启动内嵌小程序提示挂钩失败问题； - 3、解决个别电脑网络版更新授权可能不执行问题； - 4、VLC网页播放小程序增加文字描述的播放状态显示，正常播放后自动消失； - 5、VLC网页播放小程序支持获取或设置视频流相关信息，切换播放改到线程中执行避免卡顿； - 6、VLC网页播放小程序默认配置增加背景色和事件通知的过滤码，颜色支持#000000格式； - 7、Office网页小程序支持加载永中Office专业版，前端支持请求金山WPS小程序输出为OFD(国家版式文档格式标准)版式文件。 + 2、优化小程序及浏览器退出逻辑，增加强制杀小程序等待时间配置，解决可能退出时的崩溃问题； + 3、优化网页刷新后重新加载高级版内嵌小程序的性能； + 4、解决个别电脑启动内嵌小程序提示挂钩失败问题； + 5、解决个别电脑网络版更新授权可能不执行问题； + 6、解决切换标签或恢复显示时，充满网页区显示可能错位问题； + 7、解决局域网电脑数量较多时获取路由器MAC地址失败问题； + 8、解决VLC网页播放小程序因临时路径错误导致的抓图失败问题； + 9、VLC网页播放小程序增加文字描述的播放状态显示，正常播放后自动消失； + 10、VLC网页播放小程序支持获取或设置视频流相关信息，切换播放改到线程中执行避免卡顿； + 11、VLC网页播放小程序默认配置增加背景色和事件通知的过滤码，颜色支持#000000格式； + 12、VLC网页播放小程序文字描述的播放状态支持前端设置和取消显示，支持设置字体名称和字体大小； + 13、Office网页小程序支持加载永中Office专业版，前端支持请求金山WPS小程序输出为OFD(国家版式文档格式标准)版式文件。 2021-09-30 PluginOK升级网络版2.2.2.1(单机版1.5.2.1) 1、改进中间件数据存储和访问机制，优化内嵌小程序启动速度； diff --git a/Net/FileApplet.txt b/Net/FileApplet.txt index 44651dda150c85f6a673ea863b2b8b6c7d115a97..65752065eb005157a7aa41ce621f31527d3ca727 100644 --- a/Net/FileApplet.txt +++ b/Net/FileApplet.txt @@ -7,11 +7,11 @@ 2װļСڲҳ ws://localhost:83?sid=123&flag=1 мȻݵͣ -{"req":"Plugin_Install","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-09-30","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Net/WrlFileApplet.pid","MD5":"AA6A9B501071BE25A0620A41D0C78E89","Version":"2.2.2.1","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"B41B3AEDAAE9DDCFB57D149274039AA8A6385F4AFFED43E406215F4757EA546C90870DAF36D6DA2A01A2A2FFB7A37181ABA2C69431AB654D52CE5B8955078413032B3D5CCEEA2B430EB2DE9DB0B2783D1E57808AA424989EBAE3F27EB343ED27963EE8F064578F9EB6EA10AFF0C1B3B089758C9687D2A1A5DDDFA66B3650C25F4F2A99E71C7A1F40D192CA2D58B1C28C40B167120F83D3F272CE9593E5459EEF009BE08A237DBA842998DC59A77CCB53BE72D961A812FAB959A72CCDFD2FF108418E09D0A7DDE2D3EFBFD5EA55870A54719CA6710373943ABA830FE79C7CACB30A63885773CE3F3D6119FC47D55128E4EDD1055A98DA8C8286FE73CACEED4869"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-11-03","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Net/WrlFileApplet.pid","MD5":"8DB1327D2A9BAC9551F8AB5DB62F55BD","Version":"2.2.3.3","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"2686615BF365662A344CB4C9AE8E52EAB65BBB94767F2EF7CBD5DAE48117E0DE3D203D4DE101F9FDFC0DE9B5C0CB1B932D57107023E8E7BB145BE17EBD8F5DABC866BA0B1141F751886EBFDE2F3A4C6BE3A43B8C284AA4A983580BD78BD143CFCB7EECA80A4053651701307B5EDF8D710F9C09C513C2342699AB49D6D3710BAEB0D0DA7532FE8BB50D7A25FCB7B7A4CE2C32BB73865953DC7E095FE9777B942579EE2F7DAA2233375CE4CA1AB888B137E179E9202B8116FD993EC79406D76721FD543CEE9CE5F809DB246FEF04F5613AA48921803D98511D93553E5B82DC43825DB5BFBCD3F3A6931B1DC5D4DD610C80A0D802889B220E784AEB8864921F0987"}} 3ļС -{"req":"Plugin_Update","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-09-30","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Net/WrlFileApplet_Update.pid","MD5":"56FB0A0429918AD95B9C49E69316D734","Version":"2.2.2.1","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"66E1B2C1D3E8240D0A083F7C7CCF3120837AA718AA779E90BF66655FA5E8ED663560909ECC0A930409AAF0FA700F2E8C96A34D2A6EC9D4003A5CCCE069420FFC06BCCBF541EAF753943F325B349F4DC9430A5E313DEA1EDEE74DF61080D98E0E9C0003988FCD9BBA23D9CDE27A0539F5D2B41719EFB5972615401164982C8A1205C838AEF942250A66E42F3A13810B13ABFF6EA4FE96F9AE19E18C99649A1A94E2F5885C7807B3533F65E86B7C925CC02216B6320B63B170D87616C23293E12EB61E62062D07DAB5F33708D71682D74ECD4CA8CBCF079CB8A3410FB90D9A2A026F7B57694AF446B872172AE9861FFB7E0644376A6E1B027A8AA4954F33CA8A87"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"ļС","PID":"199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3","Date":"2021-11-03","Desc":"PluginOKм֮ϿļСṩļHTTPЭϴءͼļתļʡسеȷ񣬿ChromeEdgeFirefoxIEOpera360QQȵ°е","DownAddr":"http://local.zorrosoft.com/Files/Net/WrlFileApplet_Update.pid","MD5":"D28D669B638D7885631AAF752C0D4AA3","Version":"2.2.3.3","Size":491520,"HideIns":0,"Type":1,"Cookie":"","Auth":"","TK":"9AD5CC7F194AA57F3B577BC164193208BAEC0FEAAAA6EF50A533A9138A6C0F548FDC3442D930E40EDE19DFF529E37FD8E137DCB1C31CFB03DF9823BA38EFD4486CDC8DFD0303ABF6366B80FB572CCDE0E5B70EA54FFEB4EBD9C1819468E64F0702079606F5CEF6D9A11C773941FE14AF51A55AE011B21900E628BF15245417F2B5A50B52D11025499AC46957D848EE64908D8C29EBCD5E7D66B1317C01F78A9D0A0F2E2780FBE38B9AB2F98B329AE585EB7C7820E743B96572101C46E231D984E8C896120C92C4B00502DDE5721278237C10308B0666FE063B13F24509C756285720520C718188953991098A7344A2FBF6D582BA5AB3586AABE431E8BB2E295B"}} ϰװJSON汾ݲͬװʱϵͷȡµ diff --git a/Net/MSOfficeApplet.txt b/Net/MSOfficeApplet.txt index 811a413c01dc4676102e3be31e2667c5e4671aaa..925040c37cb0857ab7f4e227e30d75f6f489fa2b 100644 --- a/Net/MSOfficeApplet.txt +++ b/Net/MSOfficeApplet.txt @@ -117,14 +117,14 @@ ID为启动小程序时返回JSON中的ID值，Scall为缩放百分比 1)、请求安装微软Office内嵌网页小程序 请在测试网页输入框中，输入如下请求，然后点击发送，完成安装： -{"req":"Plugin_Install","rid":1,"para":{"Name":"微软Office在线编辑查看小程序","PID":"MSOfficeApplet","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的微软Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌Word、Excel、PowerPoint等文档进行在线编辑或审阅各类办公文档","DownAddr":"http://local.zorrosoft.com/Files/Net/MSOfficeApplet.pid","MD5":"08E667C9014FB244DD27665D0EBD164C","Version":"2.2.3.2","Size":4063232,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"779BF583B62592717B0A934B52BD79324C3FB5FF7E38966203F3AED9A45EB33F6F2034FA013A3F982E2952D6CA697F6B8A3D62B0B5FA2AEC0ADF5BD53D25BD5403E2D37A7BF5403E9A69E6B3AB304FD0CE408041799D352B0FEA1E264940A076E4661933546A2EFF2AA109220266EA1C099368142D30F71C45E768BD151D74761A949E379758338FD2971A189FF8DD759CB064689AB34824B4710E7C98DF4A4A2ABA33EB0AB6FB869881FE079C13B72B68FF3FA84CBA0F19F8842E99DFB7904CB6BB10B624D5CC61927AA13916BE6586BB04DF7226CDAD9946BA0E3C28313775D7AC7C1D16AEAD0AEEA5F2535B4D81F9ECB6165FFA79930B3025BAB51C89D1E3"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"微软Office在线编辑查看小程序","PID":"MSOfficeApplet","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的微软Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌Word、Excel、PowerPoint等文档进行在线编辑或审阅各类办公文档","DownAddr":"http://local.zorrosoft.com/Files/Net/MSOfficeApplet.pid","MD5":"45E96A51CF3684D290C033670EA7B202","Version":"2.2.3.3","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"38B5F40E76FE27E4C3EB60B2D5B9FEE72FFF3416FC553848EA0EFEAD79F43FFBB70FB98718AFA3548BB2F99CEEBC8BB2E881106CD33B0D8CC8456481BC7D2443282668864CF9915EF564F360229704CCD8663BA11AE90A142E3B91D72333B64CB2CE7C261855876E2D625C683A47F1D4E2108ED24507EF7315011B11DC6BF6C3C27D8BD9744AD081AAA213ACE5FBFB105B005FCCB851875C4C7736C4F41147082A062DA53D1117ABBB833B439A5A8E5A2BB7723A20C63CE4E9BF1C83AA769B82A2605B496E80CA815C139F93B4F656AD0C6F4A4336D8EC911A933BEF3D8CA26910033D6C814E0D1F7DCADF64D170812AD23F4F2E9BDB953AC1F45348F8A63DD2"}} 启动安装后，会不断收到安装进度直到安装结束。 在发布时，也可以把此小程序目录文件和中间件一起打包后发布，不用单独分发。 2)、请求升级微软Office内嵌网页小程序： -{"req":"Plugin_Update","rid":1,"para":{"Name":"微软Office在线编辑查看小程序","PID":"MSOfficeApplet","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的微软Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌Word、Excel、PowerPoint等文档进行在线编辑或审阅各类办公文档","DownAddr":"http://local.zorrosoft.com/Files/Net/MSOfficeApplet_Update.pid","MD5":"1B3B474A9D7FE519118395127623BDB9","Version":"2.2.3.2","Size":4063232,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"656CBD9C20FAA65C7517550130E27E92BFD18B798659B02AE93F869FFAA443572E46689958BE492F131863D62494A7681FF5526C4AB5B039074B1A1C0739919C44F19E16B861E4397FFE06C1485AA5D7842133D4C818D4F26241E6660ED538ACAEF047571D8AE846C5173AC2C4A8EFB2DE3C489A677597CEFBB1EF828E1EFFC2C9F7FC39C6FAED966898DF01ECD486E95699DC4122857B29B2C34C450890F464C75F06AFE4D6B60B53A9EB7A49BB57B8F25511DAE29ADA764A84AE637BAC37B202AD1929AA488B94652DECA44842871B89F890A8D646718777B3B58AF5435205241F551D61A84CABC379F32BBF67417B05D400447FDBFC8BCFFA5AF6AA03DBD3"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"微软Office在线编辑查看小程序","PID":"MSOfficeApplet","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的微软Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌Word、Excel、PowerPoint等文档进行在线编辑或审阅各类办公文档","DownAddr":"http://local.zorrosoft.com/Files/Net/MSOfficeApplet_Update.pid","MD5":"A04F1F15D25BC977DD17D685001D5655","Version":"2.2.3.3","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"4EAF172F020230C0B9B8428B9B48EE53E8CA25D3913E55DF80D78718C3B4016CA8A2E5C2FF9542811AFAF25B5561BEE1C62BE36B54EE4D291A40372A143D6B4AC73AF2B32148DEC63678A87CC85E1E36C82E713F0FE6476AD9CE5BA3827CB32C07CD8EF6D98CAB64B4865584746083514BED58D81E6B387A5AEA306431047BE18ECA3774B5D0542FA0870EDDD0E33700F633DF6B538CE374402FC1C6B7634955B88F20F0584150BC4D611D33723253196FA1F824EEBA44F995F7E89A3210052BB703D326C5E04E64E9A0CD577E5A5525066575FFB0C5F75B2CBDC95948EF629F0881ED6119065D54E8F63E932A55BA529EC66EC9A8CCCA838B9A5484C62ED792"}} 以上安装和升级的JSON请求包，可能因版本升级导致内容不同，如遇安装或升级时报错，请联系客服获取最新的请求包。 @@ -266,6 +266,13 @@ Name为书签名称 NoSelect为1代表去掉书签选中状态 {"req":"Office_PutSaved","rid":28,"para":{"Saved":"1"}} 返回：{"ret":0,"rid":28,"data":{"Ret":"0"}} +29）请求合并文档到指定书签内容，适用于Word软件 +File为被合并文档全路径 +Marks指定需要替换的书签名称数组 +默认在File文档中找对应书签名称的内容来替换，如没有对应书签直接插入整个文件 +{"req":"Office_MarkMerge","rid":29,"para":{"File":"D:/Zorro/TestMark.docx","Marks":["Letter","Title"]}} +返回：{"ret":0,"rid":29,"data":{"Ret":"0"}} + 5、事件通知： A、以下为Word程序通知 diff --git a/Net/PluginOK.pdf b/Net/PluginOK.pdf index 69eb37776ff4f9617f7d4d4a6ea19fbb1237979b..2670a48510cd8d1c5f94de1fc0b404db6ba8f1e1 100644 Binary files a/Net/PluginOK.pdf and b/Net/PluginOK.pdf differ diff --git a/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf b/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf index c6d84652b95ab7dbe8c16909d156fbaa3df423eb..396e2ae6ea489f461210b46482dc8516b2f22e04 100644 Binary files a/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf and b/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/PluginAuth.paf differ diff --git a/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll b/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll index 85b9adc375a9af87b8baac4b7b43e0e66d16091b..844e82f88b6992e3f3dd0ea9cf61be129a838283 100644 Binary files a/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll and b/Net/Plugins/199BB8A7-9DD5-41F5-AE9D-2AA94300B0B3/WrlFileApplet.dll differ diff --git a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/PluginAuth.paf b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/PluginAuth.paf index 72e34248e2eeaa9a4e10f0a4dfbfe55397bab3de..69586ef0b68ac4e019d4a0ba6e14e5f3d11068ff 100644 Binary files a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/PluginAuth.paf and b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/PluginAuth.paf differ diff --git a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/VlcWebPlayer.exe b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/VlcWebPlayer.exe index c250efc018de7f166deb9db027505c2764f06c18..466d37d8fa508f2c89a88caa3f7d053ffa765363 100644 Binary files a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/VlcWebPlayer.exe and b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/VlcWebPlayer.exe differ diff --git a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/X64/VlcWebPlayer.exe b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/X64/VlcWebPlayer.exe index b037dcb1d9294f437cfefd75957731f4c8382ffc..538b660107f283e30400066ca0b0326ff3949e99 100644 Binary files a/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/X64/VlcWebPlayer.exe and b/Net/Plugins/90FC7E0E-0D2F-4C38-9875-B06407CE4556/X64/VlcWebPlayer.exe differ diff --git a/Net/Plugins/MSOfficeApplet/MSOfficeApplet.exe b/Net/Plugins/MSOfficeApplet/MSOfficeApplet.exe index b3e7875ede003addfa6c478ba8e7b5a06e0e202c..aafe67e6117884c1a00e780628ff9bb827550ff1 100644 Binary files a/Net/Plugins/MSOfficeApplet/MSOfficeApplet.exe and b/Net/Plugins/MSOfficeApplet/MSOfficeApplet.exe differ diff --git a/Net/Plugins/MSOfficeApplet/PluginAuth.paf b/Net/Plugins/MSOfficeApplet/PluginAuth.paf index 799cd14c671667540081302ba696631656bc362c..bce75ea3897d5b262e23d31e2cba2c600ed25c8e 100644 Binary files a/Net/Plugins/MSOfficeApplet/PluginAuth.paf and b/Net/Plugins/MSOfficeApplet/PluginAuth.paf differ diff --git a/Net/Plugins/MSOfficeApplet/X64/MSOfficeApplet.exe b/Net/Plugins/MSOfficeApplet/X64/MSOfficeApplet.exe index 598c370d0ea20efbf55dacfdf96a562e7a9f388f..3bc2cd091df599f149b0c721fa91dec53d1ff2e2 100644 Binary files a/Net/Plugins/MSOfficeApplet/X64/MSOfficeApplet.exe and b/Net/Plugins/MSOfficeApplet/X64/MSOfficeApplet.exe differ diff --git a/Net/Plugins/VLCWebPlayer/PluginAuth.paf b/Net/Plugins/VLCWebPlayer/PluginAuth.paf index de58179a15813cd9fb6f948d5645765ce02f0b21..ea12ed16724d1b7c7ee8a713cda3dbb3e47ebea1 100644 Binary files a/Net/Plugins/VLCWebPlayer/PluginAuth.paf and b/Net/Plugins/VLCWebPlayer/PluginAuth.paf differ diff --git a/Net/Plugins/VLCWebPlayer/VlcPlayerApplet.exe b/Net/Plugins/VLCWebPlayer/VlcPlayerApplet.exe index c250efc018de7f166deb9db027505c2764f06c18..466d37d8fa508f2c89a88caa3f7d053ffa765363 100644 Binary files a/Net/Plugins/VLCWebPlayer/VlcPlayerApplet.exe and b/Net/Plugins/VLCWebPlayer/VlcPlayerApplet.exe differ diff --git a/Net/Plugins/VLCWebPlayer/X64/VlcPlayerApplet.exe b/Net/Plugins/VLCWebPlayer/X64/VlcPlayerApplet.exe index b037dcb1d9294f437cfefd75957731f4c8382ffc..538b660107f283e30400066ca0b0326ff3949e99 100644 Binary files a/Net/Plugins/VLCWebPlayer/X64/VlcPlayerApplet.exe and b/Net/Plugins/VLCWebPlayer/X64/VlcPlayerApplet.exe differ diff --git a/Net/Plugins/WpsApplet/PluginAuth.paf b/Net/Plugins/WpsApplet/PluginAuth.paf index e51782e7e5289205e5998a2b7be9fa81ea88823f..681655f235afcda1e0f51cd4c3f46dbaf28e8f90 100644 Binary files a/Net/Plugins/WpsApplet/PluginAuth.paf and b/Net/Plugins/WpsApplet/PluginAuth.paf differ diff --git a/Net/Plugins/WpsApplet/WpsApplet.exe b/Net/Plugins/WpsApplet/WpsApplet.exe index 691664f22ebe0d56dd47df3bf81e65ccda0721f7..8b23a31adabc551cea912fa3cc94554b4c997229 100644 Binary files a/Net/Plugins/WpsApplet/WpsApplet.exe and b/Net/Plugins/WpsApplet/WpsApplet.exe differ diff --git a/Net/Plugins/WpsApplet/X64/WpsApplet.exe b/Net/Plugins/WpsApplet/X64/WpsApplet.exe index 5fbc2fba14fc40f427ee28159672d7351cb2478e..70dc28f71e9035bd99b43fd88885c5e000971f68 100644 Binary files a/Net/Plugins/WpsApplet/X64/WpsApplet.exe and b/Net/Plugins/WpsApplet/X64/WpsApplet.exe differ diff --git a/Net/Plugins/YZOfficeApplet/PluginAuth.paf b/Net/Plugins/YZOfficeApplet/PluginAuth.paf index ae56326ecf905fec0af6330b87e3eda03cf4ceda..8d37ce6aab239e46fb8899263471d3ef152a5ea5 100644 Binary files a/Net/Plugins/YZOfficeApplet/PluginAuth.paf and b/Net/Plugins/YZOfficeApplet/PluginAuth.paf differ diff --git a/Net/Plugins/YZOfficeApplet/X64/YZOfficeApplet.exe b/Net/Plugins/YZOfficeApplet/X64/YZOfficeApplet.exe index bf698ff4171bde1832f98cb74953b8949fe5fcf9..5debd15b27f48ec2b71adbc71337b3f69e8deff9 100644 Binary files a/Net/Plugins/YZOfficeApplet/X64/YZOfficeApplet.exe and b/Net/Plugins/YZOfficeApplet/X64/YZOfficeApplet.exe differ diff --git a/Net/Plugins/YZOfficeApplet/YZOfficeApplet.exe b/Net/Plugins/YZOfficeApplet/YZOfficeApplet.exe index a2d8d259007aa7b3b035f4a022846e1fb782a62b..307429f345da96d3891eb59e332ddbd8bdef7bd2 100644 Binary files a/Net/Plugins/YZOfficeApplet/YZOfficeApplet.exe and b/Net/Plugins/YZOfficeApplet/YZOfficeApplet.exe differ diff --git a/Net/TestWrl.txt b/Net/TestWrl.txt index 6300bf81996ed1c7691570d0db7ce4979d8a727a..360c107cd7399f400176a18c684c461bb076fd22 100644 --- a/Net/TestWrl.txt +++ b/Net/TestWrl.txt @@ -179,7 +179,7 @@ Monitor 4PluginOK(ţ)м -{"req":"Wrl_Update","rid":1,"para":{"Name":"PluginOK","Date":"2021-10-25","Desc":"1лļǩ֤顢ɶWindows 11ʽԲԣ2ŻмС˳ƣ˳ܱ⣻3ŻˢҳǶСܣǶСʾҹʧ⣻4VLCҳСOfficeС...","DownAddr":"http://local.zorrosoft.com/Files/Update/Zba_Update.pid","MD5":"C2B4F8C90A3192676205C07AB9AC2862","Version":"2.2.3.2","Size":11239424,"HideIns":0,"Cookie":"","Auth":"","TK":"6DFF3716146BAB09E4590C1415343E7708757120DAF3A2E909DCBCDDE192A32E9339B3358D22A0B06F0A26E98CF8D74CA54F9108620EBF5043D73C9F6C5DE1B69E5B5ED5F2666C0F6159DDAF96B0154FAF3F0D4D497FF27374D2D3DDEC0C66115A7E17C13890B2C498648448F67CD6A82026064D4423A84E1FFE4AC7970BEE65D310F32CF66235BB04B8451ABFFE4C832692E961F9F49B2ED1DA75D760DF65911A7D766369D41A3A58BE26D62F31B89C2BB4E7BBC6856236D5CB176A296E360B1502E897960FE7D2217D1434FF0B21A329A3ADD0264D1401826EB9BC1AF5981A68FAFDA01F1313E805D9D9615EEBEF4663BE6919AB6038E6DD8E4F44FF084FD1"}} +{"req":"Wrl_Update","rid":1,"para":{"Name":"BrowserApplet","Date":"2021-11-03","Desc":"1лļǩ֤顢ɶWindows 11ʽԲԣ2ŻмС˳ƣ˳ܱ⣻3ŻˢҳǶСܣǶСʾҹʧ⣻4VLCҳСOfficeС...","DownAddr":"http://local.zorrosoft.com/Files/Update/Zba_Update.pid","MD5":"B9C3B8F7BF3675D4F99073C0BACC8A41","Version":"2.2.3.3","Size":11239424,"HideIns":0,"Cookie":"","Auth":"","TK":"A88DAF79EE16392AFD267B84D297434580C0D3488DEBF0F398220578BE595C783675B3E545B2B9200AB502502148E3DED4EBA6A766DA77C242EE47DCF3B0FCB394F458FFD579E86389E2E39C2417C8D101216307D288CB1BD5E0850D3572470C5666955529656D9EC0C19B379683379BA72D8F28C37800F3311DCDBAB9A0E7291C57CC4068474B8AD7601BF1BD0AF3AEF7DA2733AC753596A9744A55E093D712A3332312A2F5E8AC20A5F495B18F79874B44DBD0B0D3BB3D0A3C87170021B7797D62607B689CABB8CD64F775143034D0440180BFB3FB5F27700BAFFF0D682D21FAD30998DEBE5F0D1805CC935890EEAC858957AA6311581C37B01DC51CC7EDEC"}} 5С(C++)IEؼ(ActiveX)ʾ̼ 1)򿪲ҳӵַ diff --git a/Net/VlcPlayerApplet.txt b/Net/VlcPlayerApplet.txt index ed96cc3cb73d15a6dd0d09ab3e198200c1aaaf74..ab5abaf6a2268e9c60977f6535262940eac6b2f1 100644 --- a/Net/VlcPlayerApplet.txt +++ b/Net/VlcPlayerApplet.txt @@ -117,13 +117,13 @@ ID为启动小程序时返回JSON中的ID值，Scall为缩放百分比 1)、请求安装VLC多媒体播放网页小程序 请在测试网页输入框中，输入如下请求，然后点击发送，完成安装： -{"req":"Plugin_Install","rid":1,"para":{"Name":"VLC多媒体播放网页小程序","PID":"90FC7E0E-0D2F-4C38-9875-B06407CE4556","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcWebPlayer.pid","MD5":"75D35C54CE1A93D7BB20E63709EBD5E7","Version":"2.2.3.2","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"32E9CE7C993440A25BDC237BB12224E7F6D66E4FB612B78EEFA664AF6949FE69E9730AF73B2C240D0000C067FF6DB63B46EC8421BE814F859C13AB0EA8663B101EE5CE639A7CD0DDF1FDA36857074BEFA79BED83EE906A9D325B14135D2253AFD3C357E56C909F6E88E1AAF99D373EA0ABC6A652DB439C426608350C870A2CD426D9B589147B9B74C948F7B230279114A28EF273651D32B3EE24E5AFB2C82CEAE5E54463244DFF48E4F385BE77AB958D983BE26E71305B5845E8DC754FB8FB4CCCB09F4A26B76A98BA6A359F95F262B3113FBF9DBCF26C09CEE09F09190EA81AE095DB51B88DAAEA6CDF0F05D296D602B8874D7EC785EBCA2D69226332F71C4D"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"VLC多媒体播放网页小程序","PID":"90FC7E0E-0D2F-4C38-9875-B06407CE4556","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcWebPlayer.pid","MD5":"ECD634C19F4C25B7AA4015605E7BC32E","Version":"2.2.3.3","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"6149D8DDC987371F28034B7A97996BCC91C753714E1EC66AB54CDCC9734053F654EC1E9564072AB9EE51F1B27F8E0973610DC3598E3C448A7AB9777E3973C4A3029270BADEF5CF003857103B31A3C340BAFB1E8D445EBF0BC7DEA40C0FBD23322EB43E0D6006AF7E798B82DFC4FF5CEE36CCBF21A57227C71BF0DF26352D63980ED85FAA1B08C3223DA68366A9E4FB356BEA0F343926B4893774BB400A85941D36F7F7DF0DA230077A1F8A674EDA020F02C22AA58077571A0F3D82D0FB2F05F70E5F3BB8FC7D2A4092476C50AB5340DDCB79F18FEA0C40658DD986690B8B9E98BB114DE3995E78AEA5941B2F357EB91993A0937891EC6BB83C09DAF696D5D4B0"}} 启动安装后，会不断收到安装进度直到安装结束。 2)、请求升级VLC多媒体播放网页小程序： -{"req":"Plugin_Update","rid":1,"para":{"Name":"VLC多媒体播放网页小程序","PID":"90FC7E0E-0D2F-4C38-9875-B06407CE4556","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcWebPlayer_Update.pid","MD5":"A90A2B0BD6CE992C29B63D5BBE79A0E8","Version":"2.2.3.2","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"90ED32A4AA08AFD470071A3E5E869940AB2C4EABDD4468688954A46C315EAED3A808F7C9F4C7494F2AAC4F65E94674D5B35E960289EB6F2F0FA654301509458A2F282E9AB15B60E4ABA53923FEB476CD044A3ADDA19F141949BEFC016FD25DA42BCAC79D73888D132FF3BA3C0F0500DCF962E611D24ADB742187D2DA766DF0D5D3E8C370979FC9550D47A834E170211FF578BED5C61F0395B78116A8700F80C1033EE71F2EA4F79FBB8F6EA4975941F77ABE3BAACD63476565DAA35D7599521F3E0FCD0A1406FE8F9E59F2ABD4071BAB3A8775AF82FDF470BFFBFC04E662CA4A3FB52FE2A1435673D8F30394C8C44B72C954F8FBFE027E946E9B4E5082215231"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"VLC多媒体播放网页小程序","PID":"90FC7E0E-0D2F-4C38-9875-B06407CE4556","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcWebPlayer_Update.pid","MD5":"80EE25D90994CEC7A139BEE513F7EF58","Version":"2.2.3.3","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"7228788CCA970943FFDD77FE284371F8427195ED6FE6DE3603518576F8C532E75572FDBD6BD1C54F6265F08ACFBD8DC21B307CF33A9C655BBF46B00BB312C87E361FABB9294CE37ECEC96809AA3276B62F898D0FC4E5FBAEDBE0AC13E69A3DB7A6E422B1D734EAB193709E5D5508CB365E0E75CD2E50D7570F1941F1F20B5A20E9C874CBAAF239521F3EA7F9BA65701C80D8FDA8BA718674A7F8A34F3E18CE12275B5B6B5ECE860B521EB4B59667EC3CE0F52FA5DBF151500A0270A10DA605D27957EA666320F9CA0A3640D2E9636C71F8472A809D0387E5407FCF0AC43C1E01C73114ADD7A051323ED1C0797D44D880EA51FE8E39F5E54EDC13EDA8BBEF2A1A"}} 以上安装和升级的JSON请求包，可能因版本升级导致内容不同，如遇安装或升级时报错，请联系客服获取最新的请求包。 @@ -378,7 +378,8 @@ ID为窗口序号 Flag为1代表启用，0代表禁用 分别返回：{"ret":0,"rid":89,"ID":1,"data":{"Ret":0,"Enable":1}} 和 {"ret":0,"rid":89,"ID":2,"data":{"Ret":0,"Enable":0}} 50) 对指定RTSP流录像到文件 -Url为RTSP流地址，File为录像目标文件不指定时自动生成 Second为录制限时时间(秒)，0代表由前端指定停止 +Url为RTSP流地址，不指定时取当前焦点窗口流的 +File为录像目标文件不指定时自动生成 Second为录制限时时间(秒)，0代表由前端指定停止 {"req":"VLC_RecordFile","rid":90,"para":{"Url":"rtsp://wzh:test123456@192.168.1.8:554/h264/ch1/main/av_stream","File":"D:/Zorro/test.mp4","Second":30}} 返回：{"ret":0,"rid":90,"data":{"Ret":0,"PID":1}} diff --git a/Net/VlcWebPlayer.txt b/Net/VlcWebPlayer.txt index 0b3a4cc2f5205fe89736ffce9aa391ab7960a239..6b3b6bca60f4b7250c2ea4d06d44b1f002154d93 100644 --- a/Net/VlcWebPlayer.txt +++ b/Net/VlcWebPlayer.txt @@ -117,13 +117,13 @@ ID为启动小程序时返回JSON中的ID值，Scall为缩放百分比 1)、请求安装VLC多媒体播放网页小程序 请在测试网页输入框中，输入如下请求，然后点击发送，完成安装： -{"req":"Plugin_Install","rid":1,"para":{"Name":"VLC内嵌网页多媒体播放小程序","PID":"VLCWebPlayer","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcPlayerApplet.pid","MD5":"AE707EF51B3AF4455135BE8B57196E4B","Version":"2.2.3.2","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"1B7713421FE689C373CBAC22EE2CE97224501EC83231F5CEF75FECD6EAB7EF765765ECD5FE2988060E5E73B727A6331D351F612A44B9595127542C72DDA1186D6B9DE30E7029EC0A9E50AEC0D261E903386E883C8DAE71702FD491AF2BA8FC625090408D270E7C9C0B58FE820F37AE9975F24474276D42472A395D211136218864B713D48EFF523414CA66491C7DFDB5E4FC612BFED99BE1C383387F0B8F7967A68547C80E108139CC02FD3CE2E83298622E31D5957159E88C31215064D500CDADD28F682F153B465EED89279107C306408B12341C6D1A0AAFC85E1D61C373301BBBED747A48BB0B9D6DA609B8367ABE31F881D09A4963C9D4802828C810591F"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"VLC内嵌网页多媒体播放小程序","PID":"VLCWebPlayer","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcPlayerApplet.pid","MD5":"F5F14E24A4AC0A0DF514725B8648C586","Version":"2.2.3.3","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"84B6B701CB08115392F844469C716CAF3D44E5CDE6C8191C0ECB328F371201A1D1CED7FF471DE10B75473440EF96284F017E157BA1E0B54CB6B04386AB30FE5FBE53BA758CDC02AD15AC41642EB14C242F1156F9249E0380C8A8676D5BEACB0ACC470747ABBF6C4217585C3C4E005E2E1B45DDF1BC5187AB45A0214CB73F8D46B5525F62757FC650AC6B50000B1D678818BC598C0C356F2B176A7DBB5ECC317E9FC00AD156A069D120F7155064E49DAEB98500F8EDFDED3DA2F5EF600669CDF448E12638650C9CF992AFE703CC0A21E1B89852A0857CCC1AE1FD0F8D56B00983B0793C3385B21B0976EBB82FF4A32248B35B2B3EB580B40764817287A1C2F88D"}} 启动安装后，会不断收到安装进度直到安装结束。 2)、请求升级VLC多媒体播放网页小程序： -{"req":"Plugin_Update","rid":1,"para":{"Name":"VLC内嵌网页多媒体播放小程序","PID":"VLCWebPlayer","Date":"2021-10-25","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcPlayerApplet_Update.pid","MD5":"AF833555F536CD8C1974C5F797EB583D","Version":"2.2.3.2","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"865137F3A0CC92E07932C9A5EB5656C0E00A7AD2F334B57F1E9A200E5CE3BA045F22AE526D9602E128E6BB35A497F95B1D252572D089D33CFEAF73D5C911D8EAEA2E164AA2346BCFFB129E102F9E11FE7EEA4585CBEB5019F073802799E4BED1715D432CD70B6AB5BF02F5E8A59B12D008B7B263A6C23DCFFA437ED5AB2397B40B109A1AFC5DF5056BB0AC0E79DC8633E439913AF534DB85007FC094254C6F1A41DDF1A1BB296BDDC7A4A1AE0C2E60E9AA6E381C9A88D404F8D797A542A207EE40C9BD9511EA3C0E5533D6F26D17C65E540C57703C1FEEE19D66A172C3E6727096E6D6156C11AAE457B4DC03CB2CDEE0A44E435C3753C09D420FE81735B72FC7"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"VLC内嵌网页多媒体播放小程序","PID":"VLCWebPlayer","Date":"2021-11-03","Desc":"PluginOK之上跨浏览器的VLC多媒体播放内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中直接内嵌使用，可播放多路海康及大华等设备的实时视频","DownAddr":"http://local.zorrosoft.com/Files/Net/VlcPlayerApplet_Update.pid","MD5":"BEC1677DA47E61FAAEBBF15E68A0E717","Version":"2.2.3.3","Size":884736,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"9774AC9DD1CDDC1891A2F6EF86B447CE97766B22219773519164ACCAD138A35E55574FCAE91547BFEA055FB89A7A8825B0ECF89D4D2A4F92ED213AB953BE593CDA4B33A6F7E69E19D61386E9412B003F7017DD354219348121CCBEB8D06673A8E86151CE696591D21E16E6279F87FA38AA68D131FF3801F78A640716D237D78802B99AA09F00B778FF0022BCA92E39456F906E65C7AC6BD7E68E3B3FEA8C9B5131279A22992EACE1CBFFBAD159911E95D735E16772C2DB419DABEB40A8A91B8CEF8256354CB85BC5EF140244A92985B278ADD9D2E07C0A6DE0F125B27CA5A7699994BD195823876C24B1BD5FDCD1922EFD3860C40E6945EAF0CA4E78934726D1"}} 以上安装和升级的JSON请求包，可能因版本升级导致内容不同，如遇安装或升级时报错，请联系客服获取最新的请求包。 @@ -378,7 +378,8 @@ ID为窗口序号 Flag为1代表启用，0代表禁用 分别返回：{"ret":0,"rid":89,"ID":1,"data":{"Ret":0,"Enable":1}} 和 {"ret":0,"rid":89,"ID":2,"data":{"Ret":0,"Enable":0}} 50) 对指定RTSP流录像到文件 -Url为RTSP流地址，File为录像目标文件不指定时自动生成 Second为录制限时时间(秒)，0代表由前端指定停止 +Url为RTSP流地址，不指定时取当前焦点窗口流的 +File为录像目标文件不指定时自动生成 Second为录制限时时间(秒)，0代表由前端指定停止 {"req":"VLC_RecordFile","rid":90,"para":{"Url":"rtsp://wzh:test123456@192.168.1.8:554/h264/ch1/main/av_stream","File":"D:/Zorro/test.mp4","Second":30}} 返回：{"ret":0,"rid":90,"data":{"Ret":0,"PID":1}} diff --git a/Net/WPSOfficeApplet.txt b/Net/WPSOfficeApplet.txt index 4cd3482ac34692973e99a0c7cda98a02270eab6f..c806b8ab61fb97c66ddf21b1d36cc1228e968afb 100644 --- a/Net/WPSOfficeApplet.txt +++ b/Net/WPSOfficeApplet.txt @@ -117,14 +117,14 @@ ID为启动小程序时返回JSON中的ID值，Scall为缩放百分比 1)、请求安装金山WPS内嵌网页小程序 请在测试网页输入框中，输入如下请求，然后点击发送，完成安装： -{"req":"Plugin_Install","rid":1,"para":{"Name":"金山WPS在线编辑小程序","PID":"WpsApplet","Date":"2021-10-25","Desc":"跨浏览器的金山WPS内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/WpsApplet.pid","MD5":"C318632EFF22E2EFA356C2195E7D20A6","Version":"2.2.3.2","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"A554679A266F7ABC1AE553B9ADA14A15CB3E6628AAE72FA93D09B124B76419533A1CA4BE17FE97267CDE5A7AF84759B576B1FD8F4FA2E1F2D2C241BA990622E2C2D3D68FFADFEE806593DE238FB614A5DF1559280C7D8E1ACCA7F7CB97D8A5302C0524A3AE775F3C064CD8B34CD80FBA7D6845330B229A0E418C071318194221F6438EA3B71A36AD1D185B25235F53AC196F265244AD03306A2D0BAD81EEA3CF95277ACAED215DEB8BAE025D3B92879C91ACE1937707354E3349B64204B5DAA90AFA2967BB16FD4FC8D7CDABF27004C1D054382EC57A65A85C8B28A2B66565AB535D58B7A922D13FD758F82F0490A1B789EDF923CC4ECDAF310BECB2E781D039"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"金山WPS在线编辑小程序","PID":"WpsApplet","Date":"2021-11-03","Desc":"跨浏览器的金山WPS内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/WpsApplet.pid","MD5":"EE225BC34D42C946130F3AEE4E930295","Version":"2.2.3.3","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"791814E5C7B661627B35898E362AC135F26548AFF98A444558CC7B6A76D794CC235B0992460BD042D07ABDC25D43F6574C6B4D3AA41B7D30BBF62796EA342D2110586DA39B6AF3361272D732C1DACE807389F1A267F5E03212FC7F1D5FC5A51D3122BF6653249D7308F3F0DCE3B794AE0B200AF6BE6222646FF9BB5FDF236C5A269884FE661E1BAAB15BA2BA6696B644A86DE21BAC609CF79F877B74B52EA1748FC03F61499BD3945019D47CFE26D15DBCD16238A60911D74EA6F236990CD50235F462C24CB4E236F184C30F6C40F42741756718C608494CA6A0D8393246474ABDFC20F74926787503F486FB5B20B183B53B68A81D5AF7C9DFB4DA2DEAFB7025"}} 启动安装后，会不断收到安装进度直到安装结束。 在发布时，也可以把此小程序目录文件和中间件一起打包后发布，不用单独分发。 2)、请求升级金山WPS内嵌网页小程序： -{"req":"Plugin_Update","rid":1,"para":{"Name":"金山WPS在线编辑小程序","PID":"WpsApplet","Date":"2021-10-25","Desc":"跨浏览器的金山WPS内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/WpsApplet_Update.pid","MD5":"CABAA0220DA43777B3D296B100A86B7B","Version":"2.2.3.2","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"60364C11EE7D2F54CC59F41A0AF8884758DC97892DCE182ACF0ADA381F3360909DBAB4FFF579836FC6A72FF5546CB2E87D427F40111F067480A79D297DA73B6EC442F7749231CC0571B3EC960DB8E1B1DA2A8AF380FAB7F69DE70C662A813986DD1DB2579ADC46A9FB1578CDCBBE054509F0FBD09C0CEA5B476CA37BE1DBAA108F2A1C63DA492C6459154EB24294D60DD953C5A3B90FD5761A2DAA7CEF001D06B6D560FB1F7F980734B01261082E49B963BC06E771100659B27EA4084C427EC02687FB0EBBFE693A9A126C755B42CD39FEED7A4393FE9AA0951D7AD1FBBF4F88454624E3B2EF9023F7116F8DBCE2390F3F129CD37553C55A750078E91937A755"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"金山WPS在线编辑小程序","PID":"WpsApplet","Date":"2021-11-03","Desc":"跨浏览器的金山WPS内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/WpsApplet_Update.pid","MD5":"508E3BDAE10A091AC86D114634B95518","Version":"2.2.3.3","Size":3899392,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"06BC35BAA4BB1743EB2DAFD44E3679D30BB2ABF0BDFA26E40DBF48D45153C2C41657F9CC92342FA930D3AAC0BB8867E1D7537B2F5255EC27C3A3557339C6D03A95860115D060078E00DE90FD8D0E06A2B353AAE6828479144088491663FD6ED0B0D2D3DD3D4A198D058ECAFD7628A3095315AC72F4FE430C51DCC9462751EF4FADC329D25562D0555A6C47DC43779098F10CC079724C79123158652DBD40B0D1CCBF019385861FA18355170928E908E15634BCF5EBF8687E8C44BBA9BF963B24F6C7D48926DB21DB3B88E5BC3F5E6FCFFF822A9F6DF1E8677E32901DE7D577D2B732D0B3B608CF72F8D0D3D09A6FC2B056015024F22A2AC5FA1E9929CE3C0950"}} 以上安装和升级的JSON请求包，可能因版本升级导致内容不同，如遇安装或升级时报错，请联系客服获取最新的请求包。 @@ -253,7 +253,7 @@ Index为书签序号 {"req":"Office_PutMarkText","rid":24,"para":{"Marks":[{"Name":"Caption","Text":"公文标题"},{"Name":"Content","Text":"公文内容"},{"Name":"Description","Text":"公文说明或描叙"},{"Name":"Sec","Text":"公文密级"},{"Name":"Subject","Text":"公文主题词"}]}} 返回：{"ret":0,"rid":24,"data":{"Ret":"0"}} -25）光标跳转到指定名称的书签，适用于Word软件 +25）光标跳转到指定名称的书签，适用于WPS文字软件 Name为书签名称 NoSelect为1代表去掉书签选中状态 {"req":"Office_GotoMark","rid":25,"para":{"Name":"Caption","NoSelect":1}} 返回：{"ret":0,"rid":25,"data":{"Ret":"0"}} @@ -262,14 +262,21 @@ Name为书签名称 NoSelect为1代表去掉书签选中状态 {"req":"Office_GetRevisionsCount","rid":26,"para":{}} 返回：{"ret":0,"rid":26,"data":{"Ret":"0","Count":0}} -27）获取文档是否修改了需要保存，适用于Word软件 +27）获取文档是否修改了需要保存，适用于WPS文字软件 {"req":"Office_IsSaved","rid":27,"para":{}} 返回：{"ret":0,"rid":27,"data":{"Ret":"0","Saved":0}} -28）设置文档是否需要保存标记，适用于Word软件 +28）设置文档是否需要保存标记，适用于WPS文字软件 {"req":"Office_PutSaved","rid":28,"para":{"Saved":"1"}} 返回：{"ret":0,"rid":28,"data":{"Ret":"0"}} +29）请求合并文档到指定书签内容，适用于WPS文字软件 +File为被合并文档全路径 +Marks指定需要替换的书签名称数组 +默认在File文档中找对应书签名称的内容来替换，如没有对应书签直接插入整个文件 +{"req":"Office_MarkMerge","rid":29,"para":{"File":"D:/Zorro/TestMark.docx","Marks":["Letter","Title"]}} +返回：{"ret":0,"rid":29,"data":{"Ret":"0"}} + 5、事件通知： A、以下为WPS文字程序通知 diff --git a/Net/X64/ZbaAgent.exe b/Net/X64/ZbaAgent.exe index 7e60ba6790d44b3719d94fc422bbac18982b83b0..3eb826d13fd369b653c8dae330d2e34c983ea55c 100644 Binary files a/Net/X64/ZbaAgent.exe and b/Net/X64/ZbaAgent.exe differ diff --git a/Net/X64/ZbaApplet.dll b/Net/X64/ZbaApplet.dll index a48f9d3955da2844cec699f7db2097e5fa76bc91..491a0aa6fe579907deae1ad8e55b868449bc9774 100644 Binary files a/Net/X64/ZbaApplet.dll and b/Net/X64/ZbaApplet.dll differ diff --git a/Net/X64/ZbaBase.dll b/Net/X64/ZbaBase.dll index 2010f3c1ee0fa1c33708d420bdb0113e21aeabd1..7ebceb4f13a76a57d4f7149cd5a07444613cceaf 100644 Binary files a/Net/X64/ZbaBase.dll and b/Net/X64/ZbaBase.dll differ diff --git a/Net/X64/ZbaBrowser.dll b/Net/X64/ZbaBrowser.dll index 00a5b1f1f1f358f7faa23bed3c44e2562d09352f..82e0fa74176c8e982e7ffe477d849ffda6484053 100644 Binary files a/Net/X64/ZbaBrowser.dll and b/Net/X64/ZbaBrowser.dll differ diff --git a/Net/X64/ZbaEngine.dll b/Net/X64/ZbaEngine.dll index 8a3bf10ccfce73dd6603e19dc57bb11a0534701b..3a022754e55cee797956eeacc6af3bf0084307f6 100644 Binary files a/Net/X64/ZbaEngine.dll and b/Net/X64/ZbaEngine.dll differ diff --git a/Net/X64/ZbaHttp.dll b/Net/X64/ZbaHttp.dll index a9f369cbbdc4556a6b6c0ed8f9fd7195b997c8b2..ab077e3c3f0e6a7325b273c83d52ff36c0e0e76b 100644 Binary files a/Net/X64/ZbaHttp.dll and b/Net/X64/ZbaHttp.dll differ diff --git a/Net/YZOfficeApplet.txt b/Net/YZOfficeApplet.txt index 96c5117f6e92b5182177898767b479efc52717fa..4171e69dce5fec4312cb4bafb7e23b286be5063b 100644 --- a/Net/YZOfficeApplet.txt +++ b/Net/YZOfficeApplet.txt @@ -117,14 +117,14 @@ ID为启动小程序时返回JSON中的ID值，Scall为缩放百分比 1)、请求安装永中内嵌网页Office小程序 请在测试网页输入框中，输入如下请求，然后点击发送，完成安装： -{"req":"Plugin_Install","rid":1,"para":{"Name":"永中Office在线编辑小程序","PID":"YZOfficeApplet","Date":"2021-10-25","Desc":"跨浏览器的永中Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/YZOfficeApplet.pid","MD5":"7325C5842636DEFBE3BCA133082A3EEF","Version":"2.2.3.2","Size":3932160,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"B0886885DE11171D14C3BEAC29F56C6595F285D6748E196D71AF4412E41DF2F4676ECA26897CCC2E37A6A4D57428B67B3B123FEF0225EA9911ADFB014145EA44CFFE86D5415D6535C18FC330AF5872B7A920CA8AEF7A6FB8513510A961109B30589A4C50E3E1174630B34A30D053A481CF1D3555189D9E59A4D21EF9073F584B6FE6D7E7B55F35E9C4DFF3937E83D7E5D59556F1E106CCF3A9F3ECAC62AC46AE81806EF223349E48BA0E515D960CD4EDF23F85A41441D1EE3F441FB3AA5CF647F26C58478AA03DED93AE8C6DBC99E8F41472196502282995700672A845A4BDF749C7F18125B801A9FF4D9AF62D38032E56BA17692E0F73F88A1452866043C218"}} +{"req":"Plugin_Install","rid":1,"para":{"Name":"永中Office在线编辑小程序","PID":"YZOfficeApplet","Date":"2021-11-03","Desc":"跨浏览器的永中Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/YZOfficeApplet.pid","MD5":"696A041CAE0004201148089E953CC939","Version":"2.2.3.3","Size":3932160,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"6C62A4663D276A857A6BA4C7147187E2877C3E32120668DB0ACC41BDC5B4D48C8DB95E2FC26DBE9F68080E1E44169B22D9EE622EF38BC80AEE68E656CBA5B21602B9482C1D2668FA7D1D0A7EF60C098E8631C3760A95DC4D73AEBF9A9B659E16B0D3BDA9AF37A32845F9620A904CCCE1D78DCC3C3F7BCEF4939EF2A015C89B0F67C42506F95AFC9C7D4A8A8926502D3E56AE17D411813E5078A0D3328D9180FE9EA8D49978BE77757B5768678613F5B6F3863606436B8EE00593BB2F46F52B968C45C88A0F263DB15CBA58E06FC53654100C7B51C4E77EE60EBE0E0C1043A6E67EB71D7CF5FED23FE1C24C73B78A47115B8D0E1B06A61FBFEB0A2FBE6D3B5A46"}} 启动安装后，会不断收到安装进度直到安装结束。 在发布时，也可以把此小程序目录文件和中间件一起打包后发布，不用单独分发。 2)、请求升级永中内嵌网页Office小程序： -{"req":"Plugin_Update","rid":1,"para":{"Name":"永中Office在线编辑小程序","PID":"YZOfficeApplet","Date":"2021-10-25","Desc":"跨浏览器的永中Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/YZOfficeApplet_Update.pid","MD5":"4F5601C4296F900D568332A6F2105A8C","Version":"2.2.3.2","Size":3932160,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"6D2FB10B84CF302DC2967F66678CDF3E6370DCC8CD5147C1A4E6323D8BF9692832BA9A829FACC2A853D13F60D57F4A97026ADA4F8ECF3BEF069E8CEDD160DE9C8EA47D7F983AB0E114273A3BA37C9F017D69B47EB2B4AF0DE89CF4145A881372247EABD833A3C799171007097878E033D1E4A98704FC946E057C3118AAE3E4AA34212197E1882A033D3AC02598744CFCB2BADA49F5FCC5194F188C66242300D1275262D865926B5B8F6EE04456D15DF4140993B74F362418B5B29D97BC0B6B2A8CA43B76314EF601B34869D6430132FEE970912ECB997B1362B8EF62EEFCD218B49A348F0FF23757FFC26768C7F8F40E9A09F6F3E708589CC5682A88F904B4E0"}} +{"req":"Plugin_Update","rid":1,"para":{"Name":"永中Office在线编辑小程序","PID":"YZOfficeApplet","Date":"2021-11-03","Desc":"跨浏览器的永中Office内嵌网页小程序，支持在Chrome、Edge、Firefox、IE、Oprea、360、QQ等最新版本浏览器网页中内嵌文字、表格、演示等程序进行在线编辑或审阅各类办公文档。","DownAddr":"http://local.zorrosoft.com/Files/Net/YZOfficeApplet_Update.pid","MD5":"91162E5CE502EAD79A6C8696E32BABCE","Version":"2.2.3.3","Size":3932160,"HideIns":0,"Type":8,"Cookie":"","Auth":"","TK":"982F46AFA9EC7710C56F11AFB7ECF561231C06F16B7CBBEAA0CCD45F9AC19433AABE16DE695894DF77AB937FE2F3B8FB12F5CBEC548C21747439020CD17F6AEA366268DD71035B106AE1E78B65A18B0488F689E09067AB08B94BFCF305CCEF21B9B27231C92AD7A641A27793D34F57F7E74E7546AAC0A5A08605C630DD350A9F7D30395D64B049B6618C2696DA19505523066B2915B87556023B24F070CA38D89E363F6E57F29EF9980A0BD08DF259AC3DBC1CBBBFC66F56966DB532E21513E63016DE3BB6ED2667C42249DA7342A650EB329EFBF5167B0163A2DF5CFD57DD3B23930AD4B3BD6B3A1478C3D1BD167824F3C6EF558FFFCF75D3F60DF61FBCC076"}} 以上安装和升级的JSON请求包，可能因版本升级导致内容不同，如遇安装或升级时报错，请联系客服获取最新的请求包。 @@ -267,6 +267,13 @@ Name为书签名称 NoSelect为1代表去掉书签选中状态 {"req":"Office_PutSaved","rid":28,"para":{"Saved":"1"}} 返回：{"ret":0,"rid":28,"data":{"Ret":"0"}} +29）请求合并文档到指定书签内容，适用于永中文字软件 +File为被合并文档全路径 +Marks指定需要替换的书签名称数组 +默认在File文档中找对应书签名称的内容来替换，如没有对应书签直接插入整个文件 +{"req":"Office_MarkMerge","rid":29,"para":{"File":"D:/Zorro/TestMark.docx","Marks":["Letter","Title"]}} +返回：{"ret":0,"rid":29,"data":{"Ret":"0"}} + 5、事件通知： A、以下为永中文字程序通知 diff --git a/Net/ZbaAgent.exe b/Net/ZbaAgent.exe index 5e4e1df069dbbfb3557c85c2e127b761a52ad055..0678a6c7d86602927419468d780f8a027fce4554 100644 Binary files a/Net/ZbaAgent.exe and b/Net/ZbaAgent.exe differ diff --git a/Net/ZbaApplet.dll b/Net/ZbaApplet.dll index 6590fac23ed3868e43e629d1c7251b4a8f1b9e12..7ebfea2edf906800d1dc9af8c58fdb0da7e26bab 100644 Binary files a/Net/ZbaApplet.dll and b/Net/ZbaApplet.dll differ diff --git a/Net/ZbaBase.dll b/Net/ZbaBase.dll index d0b474f71297e2046bfa3c8f6e74164788d13b47..21a96d5f8b5000be4cbe688f83ecfceb6554db80 100644 Binary files a/Net/ZbaBase.dll and b/Net/ZbaBase.dll differ diff --git a/Net/ZbaBrowser.dll b/Net/ZbaBrowser.dll index de5af48c0b0d91ad8249db534353d26c5e11de30..35b397b8878c25c9ca9d64fc0bc3b730e140f8a9 100644 Binary files a/Net/ZbaBrowser.dll and b/Net/ZbaBrowser.dll differ diff --git a/Net/ZbaEngine.dll b/Net/ZbaEngine.dll index 649a8e9014cc027f43a91bf1b8a129f7955d5921..b35bcfbb8c340521b6ddccae54d780c09d6dd16a 100644 Binary files a/Net/ZbaEngine.dll and b/Net/ZbaEngine.dll differ diff --git a/Net/ZbaHttp.dll b/Net/ZbaHttp.dll index 1abc0e2b7bc09b045104fbe793b20a39a064368c..1912313863b80ecad5847b5f001ad19d18f4b09e 100644 Binary files a/Net/ZbaHttp.dll and b/Net/ZbaHttp.dll differ diff --git a/Net/ZbaService.exe b/Net/ZbaService.exe index 37293292574bc38468baa831db935b4e567660e3..283c8c41640e566f5644025056c0750842d5ccbe 100644 Binary files a/Net/ZbaService.exe and b/Net/ZbaService.exe differ diff --git a/Net/ZbaSetup.exe b/Net/ZbaSetup.exe index 6fe80d8a3c9a23167289b4998b1a13c293899ce1..fabdeb88bdc08a19a2ec5a538ec00b05f663480e 100644 Binary files a/Net/ZbaSetup.exe and b/Net/ZbaSetup.exe differ diff --git a/PluginOK_Install.iss b/PluginOK_Install.iss index abc328a3b6862b722c2eff0b609ff4ee598da3f5..e16ed795692c1890b921665adab5cbdee69c13bc 100644 --- a/PluginOK_Install.iss +++ b/PluginOK_Install.iss @@ -2,7 +2,7 @@ ; йش Inno Setup űļϸİĵ #define MyAppName "PluginOKм" -#define MyAppVersion "1.5.3.2" +#define MyAppVersion "1.5.3.3" #define MyAppPublisher "ɶ޹˾" #define MyAppURL "http://www.zorrosoft.com/" #define MyAppExeName "WrlSetup.exe" diff --git a/PluginOK_Net.iss b/PluginOK_Net.iss index 68e3304421961ee09ed94545cd4c06fc69be80ec..e6b5c9d238294b8059949822c9cc6ef994218d8a 100644 --- a/PluginOK_Net.iss +++ b/PluginOK_Net.iss @@ -2,7 +2,7 @@ ; йش Inno Setup űļϸİĵ #define MyAppName "PluginOKм" -#define MyAppVersion "2.2.3.2" +#define MyAppVersion "2.2.3.3" #define MyAppPublisher "ɶ޹˾" #define MyAppURL "http://www.zorrosoft.com/" #define MyAppExeName "ZbaSetup.exe" diff --git a/PluginOK_Server.iss b/PluginOK_Server.iss index e5bfd140eb45e964143bf6cddb52a504dcb16876..d1be70856a1d38cf8638dba6f5809bcdf192bef5 100644 --- a/PluginOK_Server.iss +++ b/PluginOK_Server.iss @@ -2,7 +2,7 @@ ; йش Inno Setup űļϸİĵ #define MyAppName "PluginOKм" -#define MyAppVersion "2.2.3.2" +#define MyAppVersion "2.2.3.3" #define MyAppPublisher "ɶ޹˾" #define MyAppURL "http://www.zorrosoft.com/" #define MyAppExeName "ZbaSetup.exe" diff --git a/WrlSDK/Package/WrlEngine.dll b/WrlSDK/Package/WrlEngine.dll index 703dac9fbccde15fa92c9c3895ad05112a483303..35d2ad9f12dd44fea81606f014fb16b43fb5b79e 100644 Binary files a/WrlSDK/Package/WrlEngine.dll and b/WrlSDK/Package/WrlEngine.dll differ diff --git a/WrlSDK/Package/WrlPackage.exe b/WrlSDK/Package/WrlPackage.exe index a19be1758ffb1c39afeac7c4cd056a72ff66f1fa..aad07a62f653848a8a366b4b851abcf379f67cb7 100644 Binary files a/WrlSDK/Package/WrlPackage.exe and b/WrlSDK/Package/WrlPackage.exe differ diff --git a/WrlSDK/PluginOK.pdf b/WrlSDK/PluginOK.pdf index 69eb37776ff4f9617f7d4d4a6ea19fbb1237979b..2670a48510cd8d1c5f94de1fc0b404db6ba8f1e1 100644 Binary files a/WrlSDK/PluginOK.pdf and b/WrlSDK/PluginOK.pdf differ diff --git "a/WrlSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" "b/WrlSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" index ad2d9ed0bb536540732b9dc62c01ade26e06007d..c567ef123f9538bc0334dcbe2a42c154978643de 100644 Binary files "a/WrlSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" and "b/WrlSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" differ diff --git a/WrlSDK/SampleCode/Bin/WrlApplet.dll b/WrlSDK/SampleCode/Bin/WrlApplet.dll index 0f8d234fda243e263dee953a1f0ca4ced51095be..e50372a1adfcd63dc1a18fa13aff2075c291cced 100644 Binary files a/WrlSDK/SampleCode/Bin/WrlApplet.dll and b/WrlSDK/SampleCode/Bin/WrlApplet.dll differ diff --git a/WrlSDK/SampleCode/Bin/WrlBase.dll b/WrlSDK/SampleCode/Bin/WrlBase.dll index 32865200439d65db91b7a121dddcf32480ce76a8..76454e15e774621e1701c99de870a27acb684876 100644 Binary files a/WrlSDK/SampleCode/Bin/WrlBase.dll and b/WrlSDK/SampleCode/Bin/WrlBase.dll differ diff --git a/WrlSDK/SampleCode/Bin/WrlEngine.dll b/WrlSDK/SampleCode/Bin/WrlEngine.dll index 703dac9fbccde15fa92c9c3895ad05112a483303..35d2ad9f12dd44fea81606f014fb16b43fb5b79e 100644 Binary files a/WrlSDK/SampleCode/Bin/WrlEngine.dll and b/WrlSDK/SampleCode/Bin/WrlEngine.dll differ diff --git a/ZbaSDK/Package/ZbaEngine.dll b/ZbaSDK/Package/ZbaEngine.dll index 649a8e9014cc027f43a91bf1b8a129f7955d5921..b35bcfbb8c340521b6ddccae54d780c09d6dd16a 100644 Binary files a/ZbaSDK/Package/ZbaEngine.dll and b/ZbaSDK/Package/ZbaEngine.dll differ diff --git a/ZbaSDK/Package/ZbaPackage.exe b/ZbaSDK/Package/ZbaPackage.exe index 84f8a7a8686c98dadacbfba086ec8d63e8920b86..dd817af9fd15578a275f2e9b8c69b64debd5eee4 100644 Binary files a/ZbaSDK/Package/ZbaPackage.exe and b/ZbaSDK/Package/ZbaPackage.exe differ diff --git a/ZbaSDK/PluginOK.pdf b/ZbaSDK/PluginOK.pdf index 69eb37776ff4f9617f7d4d4a6ea19fbb1237979b..2670a48510cd8d1c5f94de1fc0b404db6ba8f1e1 100644 Binary files a/ZbaSDK/PluginOK.pdf and b/ZbaSDK/PluginOK.pdf differ diff --git "a/ZbaSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" "b/ZbaSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" index ad2d9ed0bb536540732b9dc62c01ade26e06007d..c567ef123f9538bc0334dcbe2a42c154978643de 100644 Binary files "a/ZbaSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" and "b/ZbaSDK/PluginOK\345\274\200\345\217\221\350\200\205\346\211\213\345\206\214.pdf" differ diff --git a/ZbaSDK/SampleCode/Bin/ZbaApplet.dll b/ZbaSDK/SampleCode/Bin/ZbaApplet.dll index 6590fac23ed3868e43e629d1c7251b4a8f1b9e12..7ebfea2edf906800d1dc9af8c58fdb0da7e26bab 100644 Binary files a/ZbaSDK/SampleCode/Bin/ZbaApplet.dll and b/ZbaSDK/SampleCode/Bin/ZbaApplet.dll differ diff --git a/ZbaSDK/SampleCode/Bin/ZbaBase.dll b/ZbaSDK/SampleCode/Bin/ZbaBase.dll index d0b474f71297e2046bfa3c8f6e74164788d13b47..21a96d5f8b5000be4cbe688f83ecfceb6554db80 100644 Binary files a/ZbaSDK/SampleCode/Bin/ZbaBase.dll and b/ZbaSDK/SampleCode/Bin/ZbaBase.dll differ diff --git a/ZbaSDK/SampleCode/Bin/ZbaEngine.dll b/ZbaSDK/SampleCode/Bin/ZbaEngine.dll index 649a8e9014cc027f43a91bf1b8a129f7955d5921..b35bcfbb8c340521b6ddccae54d780c09d6dd16a 100644 Binary files a/ZbaSDK/SampleCode/Bin/ZbaEngine.dll and b/ZbaSDK/SampleCode/Bin/ZbaEngine.dll differ