diff --git a/.collaboration b/.collaboration index 609d80d8..e5208014 100644 --- a/.collaboration +++ b/.collaboration @@ -1774,16 +1774,7 @@ }, { "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-28T10:54:55.5445035+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\订阅钉钉回调事件.json" - ] + "ModuleType": 27 }, { "ModuleName": "ServerCommand/创建任务审批待办", @@ -2475,52 +2466,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-28T10:57:10.575573+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_102_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\EL插件102版本.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_102_0.zip", - "Plugin\\JSON数据源-10_0_102_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0.zip", - "Plugin\\Notiflix_Forguncy.zip", - "Plugin\\OPENAI套件-10_0_5_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_102_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\加载动画-10_0_102_0.zip", - "Plugin\\发送HTTP请求命令-10_0_102_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_102_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0.zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0.zip", - "Plugin\\支持预览的附件上传-10_0_102_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\标签页和打开标签命令-10_0_102_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_102_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_102_0.zip", - "Plugin\\设置焦点命令-10_0_102_0.zip", - "Plugin\\读取管理控制台日志-10_0_5_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2600,16 +2546,7 @@ }, { "ModuleName": "ServerCommandPrivate/钉钉事件处理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-11-28T10:56:10.6227032+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉事件处理.json" - ] + "ModuleType": 27 }, { "ModuleName": "Image/默认头像.png", diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 7bdebe94..1250d0c1 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json index 15d81870..1c454821 100644 --- a/ServerCommands/钉钉/订阅钉钉回调事件.json +++ b/ServerCommands/钉钉/订阅钉钉回调事件.json @@ -39,15 +39,6 @@ "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ - { - "$type": "JsonUtilityCommand.JsonSerializeCommand, JsonUtilityCommand", - "SourceObject": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=事件体" - }, - "ToParameter": "事件体字符串", - "BreakpointIdentity": "f898b902-8680-40a6-bc93-6722627c5555" - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "钉钉事件处理", @@ -67,7 +58,7 @@ "ParamName": "事件体", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=事件体字符串" + "SerializeProperty": "=事件体" } }, { @@ -158,7 +149,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "标题", - "GUID": "7869aa09-52a7-4289-969c-cf1658379c85" + "GUID": "856f0837-3d5f-4f8f-ba12-e6a4a24bb345" }, "Value": "钉钉回调处理异常" }, @@ -168,7 +159,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "内容", - "GUID": "c50e5ae2-2a7d-4be3-aedf-e715f0356f10" + "GUID": "7c51de84-75df-44fa-9a26-d78172d472da" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -181,7 +172,7 @@ "$type": "ForguncyDataAccess.BindingInfo, ForguncyDataAccess", "TableName": "日志表", "ColumnName": "类型", - "GUID": "9e73ad94-f21e-4edd-b999-41988bd9f6e9" + "GUID": "253fa5a1-4891-494d-b77c-65e90397e7e6" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", diff --git a/ServerCommands/钉钉/钉钉事件处理.json b/ServerCommands/钉钉/钉钉事件处理.json index 62ea3b5c..936ed282 100644 --- a/ServerCommands/钉钉/钉钉事件处理.json +++ b/ServerCommands/钉钉/钉钉事件处理.json @@ -488,7 +488,7 @@ } ] }, - "ID": "4efaa5ff-6f9e-4275-8b6b-40ec446164ae" + "ID": "f6ef28ab-8bde-4c71-83dd-9559825a55af" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -626,7 +626,7 @@ } ] }, - "ID": "d0cc3520-d27e-4f09-90a0-48655dbe05b5" + "ID": "32ff7fd8-b584-4453-94e5-50dafdd2fd25" } ] }, @@ -635,7 +635,7 @@ ] }, "Comments": "会议创建事件", - "ID": "16638f7a-0f7f-4eee-b28d-e7812c5b6d1d" + "ID": "5d826bf9-caff-40a2-b591-478f7aff91ce" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -670,7 +670,7 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=事件体.openConfModel.confDuration/1000" }, - "ID": "26c891fc5f404836ba21af9a29135140", + "ID": "3b3870a04cd24045b7c85e0c2d3e07af", "BreakpointIdentity": "f0c977f8-0e80-4d99-ad98-6b97538790d8" }, { @@ -790,11 +790,6 @@ "CommandList": { "$type": "System.Collections.Generic.List`1[[GrapeCity.Forguncy.Commands.Command, Forguncy.Commands]], System.Private.CoreLib", "$values": [ - { - "$type": "GETPOST.程序类.程序_延时, GETPOST", - "CanShu": "3000", - "BreakpointIdentity": "dcbf1b60-e1d4-40c1-9902-837dec7eac71" - }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", "ServerCommandName": "创建项目视频会议", @@ -904,12 +899,12 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=创建会议ID" }, - "ID": "d9bc42209d6e4023a8515c64f5b467b2", + "ID": "9cbd4a0bbfb54ffc91878991986ad2d2", "BreakpointIdentity": "63e9670c-c713-404f-b0cf-9e6197ddc66e" } ] }, - "ID": "64ccb7a1-42b1-4e99-aff4-303083ccf50c" + "ID": "276444ec-323a-46cf-a853-ffe6e7216162" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -919,12 +914,12 @@ { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "新会议ID", - "ID": "06b6d353a7f448e791893c06ad9cb61b", + "ID": "bfe6b8836273419ba882d0050092e600", "BreakpointIdentity": "63e9670c-c713-404f-b0cf-9e6197ddc66e" } ] }, - "ID": "8522732a-0750-48bb-aeed-c2c0902297c9" + "ID": "0f53acea-66be-418d-9f07-69859a1cdb0d" } ] }, @@ -1044,7 +1039,7 @@ } ] }, - "ID": "90b6f700-ebcf-409f-9f7a-f8e1d7eab9df" + "ID": "e9c9cade-d713-4bd3-8d53-0ee03d15f43b" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1182,7 +1177,7 @@ } ] }, - "ID": "9fb174f8-ad1c-4421-a092-1efa0745f490" + "ID": "2d5ca38f-1a8c-4fb1-905f-8618e833f68f" } ] }, @@ -1190,7 +1185,7 @@ } ] }, - "ID": "0ab9be0a-ccbc-43c9-9f01-0b7e73b4c875" + "ID": "00cfd656-e6ec-43b9-b004-92263d0c36b4" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1276,7 +1271,7 @@ } ] }, - "ID": "55847a88-361d-4203-bc33-b17c10f3b4d4" + "ID": "4ddd13cc-de0e-4d6e-8a29-93a79faace4c" } ] }, @@ -1290,7 +1285,7 @@ } ] }, - "ID": "0a6020ec-e3f1-448c-92d8-8bdeb26f17cd" + "ID": "2283863a-94bd-45d2-8509-9d534741f054" } ] }, @@ -1299,7 +1294,7 @@ ] }, "Comments": "会议状态变更", - "ID": "9249027a-bbf6-47b4-9556-beca955f7a32" + "ID": "ffeb8dc5-e077-465d-bd6e-85c0780a2821" }, { "$type": "Forguncy.Model.ConditionAndCommandPair, ServerDesignerCommon", @@ -1418,7 +1413,7 @@ } ] }, - "ID": "178f08f6-236e-4485-adee-72dffeb5f956" + "ID": "2819df18-d188-4742-a5b7-2c60320657fd" } ] }, @@ -1430,7 +1425,7 @@ } ] }, - "ID": "b5a67aff-e46b-44ea-8b25-ec8bd6814ce8" + "ID": "553399d4-b199-412c-993b-bdca76bed1ba" } ] },