diff --git a/.collaboration b/.collaboration index 4c1d25a6..5d87fbed 100644 --- a/.collaboration +++ b/.collaboration @@ -1654,16 +1654,7 @@ }, { "ModuleName": "TaskScheduler/应用部署时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T15:55:57.3083099+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\事件任务\\应用部署时.json" - ] + "ModuleType": 16 }, { "ModuleName": "TaskScheduler/应用启动时", @@ -2259,50 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T16:07:19.0672082+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAIFORGUNCY.zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\内容编辑器-9_0_103_0.zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2482,16 +2430,7 @@ }, { "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T15:53:23.7837067+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\订阅钉钉回调事件.json" - ] + "ModuleType": 27 }, { "ModuleName": "Tables/会议", @@ -2519,12 +2458,6 @@ }, { "ModuleName": "ServerCommand/服务端命令4", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T15:45:21.7793171+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index e6f27525..809fad8f 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/SchedulerTasks/事件任务/应用部署时.json b/SchedulerTasks/事件任务/应用部署时.json index 005ffed0..617ba4a2 100644 --- a/SchedulerTasks/事件任务/应用部署时.json +++ b/SchedulerTasks/事件任务/应用部署时.json @@ -1,6 +1,6 @@ { "Name": "应用部署时", - "Enabled": true, + "Enabled": false, "Triggers": [ { "$type": "Forguncy.SaveLoad.AppReDeployTriggerSaveData, ServerDesignerCommon" diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json index cd6954b2..f309871d 100644 --- a/ServerCommands/钉钉/订阅钉钉回调事件.json +++ b/ServerCommands/钉钉/订阅钉钉回调事件.json @@ -15,47 +15,93 @@ "$type": "DingTalkPlugin.DingtalkStream, DingTalkPlugin", "CommandList": [ { - "$type": "GETPOST.JSON类.JSON序列化, GETPOST", - "BianmaMsg": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result" - }, - "FanHuiMsg": "json_result" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "日志表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "标题", - "GUID": "216fd930-4eb7-43eb-9ab7-cae775ab3326" + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "GETPOST.JSON类.JSON序列化, GETPOST", + "BianmaMsg": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + }, + "FanHuiMsg": "json_result" }, - "Value": "钉钉回调事件" - }, - { - "BindingInfo": { + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "日志表", - "ColumnName": "内容", - "GUID": "773e75d6-216b-4a60-999c-ebc55f8f92c9" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=json_result" + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "9c35ba08-54d6-4d3b-ac42-a7f1e5ca4497" + }, + "Value": "钉钉回调事件" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "cc6f1e2b-134f-41f9-94e0-94929e1a38e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=json_result" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "6474bf86-79e7-4f6a-9588-f7fffa665451" + }, + "Value": "Info" + } + ] } - }, - { - "BindingInfo": { + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "日志表", - "ColumnName": "类型", - "GUID": "f49317c7-0fcb-4d6a-ad97-ae1e26d30e33" - }, - "Value": "Info" - } - ] + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "4b257287-6c90-4f8b-99cf-d6b37fd02eb9" + }, + "Value": "订阅钉钉回调子命令" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "335f0b1e-6505-46c5-a651-703229369a66" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "44a2d69d-82af-41fd-8881-b578b2c600a3" + }, + "Value": "Error" + } + ] + } + ] + } } ], "ResultTo": "result" @@ -74,15 +120,15 @@ "BindingInfo": { "TableName": "日志表", "ColumnName": "标题", - "GUID": "58341e06-9669-4dd8-b212-c67e1c97443c" + "GUID": "e7e0a386-6011-4cec-80e4-99fb58e62835" }, - "Value": "订阅钉钉回调事件" + "Value": "订阅钉钉回调事件注册" }, { "BindingInfo": { "TableName": "日志表", "ColumnName": "内容", - "GUID": "f11e55a1-2573-441b-8ff8-e092b8ce67b6" + "GUID": "bce32959-8f8a-4a42-96b4-8a858cc50616" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -93,7 +139,7 @@ "BindingInfo": { "TableName": "日志表", "ColumnName": "类型", - "GUID": "bdf27aec-d0aa-42de-be36-a01caabc8591" + "GUID": "6b009867-868c-49a5-a1f9-703e9286b9d3" }, "Value": "Error" }