diff --git a/.collaboration b/.collaboration index af010917..7b008643 100644 --- a/.collaboration +++ b/.collaboration @@ -1654,29 +1654,11 @@ }, { "ModuleName": "TaskScheduler/应用部署时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:19:18.2517262+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\事件任务\\应用部署时.json" - ] + "ModuleType": 16 }, { "ModuleName": "TaskScheduler/应用启动时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:19:10.7294308+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\事件任务\\应用启动时.json" - ] + "ModuleType": 16 }, { "ModuleName": "SchedulerTasks/定时任务", @@ -2268,50 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:20:01.234262+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", @@ -2495,15 +2434,6 @@ }, { "ModuleName": "ServerCommandPrivate/订阅钉钉回调事件", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-24T12:12:31.0669973+08:00", - "ModuleType": 27, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\订阅钉钉回调事件.json" - ] + "ModuleType": 27 } ] \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip index 10021de7..e6f27525 100644 Binary files a/Plugin/DingTalkPlugin.zip and b/Plugin/DingTalkPlugin.zip differ diff --git a/SchedulerTasks/事件任务/应用启动时.json b/SchedulerTasks/事件任务/应用启动时.json index 1513f578..a3059f1e 100644 --- a/SchedulerTasks/事件任务/应用启动时.json +++ b/SchedulerTasks/事件任务/应用启动时.json @@ -19,30 +19,6 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "初始化钉钉配置", - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "订阅钉钉回调事件", - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "RefreshAfterFinish": true, - "CheckDataValidation": true - }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": { diff --git a/SchedulerTasks/事件任务/应用部署时.json b/SchedulerTasks/事件任务/应用部署时.json index 1c7b7e81..005ffed0 100644 --- a/SchedulerTasks/事件任务/应用部署时.json +++ b/SchedulerTasks/事件任务/应用部署时.json @@ -19,6 +19,30 @@ "RefreshAfterFinish": true, "CheckDataValidation": true }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "初始化钉钉配置", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "订阅钉钉回调事件", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", "ErrorCode": { diff --git a/ServerCommands/钉钉/订阅钉钉回调事件.json b/ServerCommands/钉钉/订阅钉钉回调事件.json index 65a19263..7e68d9a6 100644 --- a/ServerCommands/钉钉/订阅钉钉回调事件.json +++ b/ServerCommands/钉钉/订阅钉钉回调事件.json @@ -8,55 +8,100 @@ ], "Commands": [ { - "$type": "DingTalkPlugin.DingtalkStream, DingTalkPlugin", - "CreatorId": "1", - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "回调接收数据", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result" - }, - "ID": "483928c1c08a40a2a014279db70bf069" - }, - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "日志表", - "UpdateType": "add", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "标题", - "GUID": "6f200037-398c-4881-b466-57897d158672" + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "DingTalkPlugin.DingtalkStream, DingTalkPlugin", + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "回调接收数据", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + }, + "ID": "aecc677bb03d4cc48e981dc8e7ccf656" }, - "Value": "钉钉回调事件" - }, - { - "BindingInfo": { + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "日志表", - "ColumnName": "内容", - "GUID": "d6cc1f78-ea25-4d5c-9069-d9fd52931051" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=result" + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "9ccc9fb9-2f2e-41dc-91be-76f7aa30ba08" + }, + "Value": "钉钉回调事件" + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "3cd1593e-e1d3-4416-a394-797980286dff" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=回调接收数据" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "c7384125-0e89-4ef3-807c-39c88fe39406" + }, + "Value": "Stream" + } + ] } - }, - { - "BindingInfo": { - "TableName": "日志表", - "ColumnName": "类型", - "GUID": "a89b4024-1312-4bbf-b942-39ed16997154" + ], + "ResultTo": "result" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "日志表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "标题", + "GUID": "2330cb09-459f-452d-8aec-fad864ad8517" + }, + "Value": "订阅钉钉回调事件" }, - "Value": "Stream" - } - ] - } - ], - "ResultTo": "result" + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "内容", + "GUID": "ed3e3066-c332-4fa2-b590-eecd6b8a1e08" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + }, + { + "BindingInfo": { + "TableName": "日志表", + "ColumnName": "类型", + "GUID": "a4beaf92-4007-4a88-9d78-00e839959744" + }, + "Value": "Error" + } + ] + } + ] + } } ] } \ No newline at end of file