diff --git a/.collaboration b/.collaboration index f5dc3b99..7323e189 100644 --- a/.collaboration +++ b/.collaboration @@ -2230,18 +2230,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:39:30.314437+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2265,49 +2254,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:40:37.6536379+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\\OPENAI套件-10_0_3_0(1).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_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).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\\异步运行命令-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\\用户管理命令-10_0_2_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.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2399,16 +2346,7 @@ }, { "ModuleName": "ServerCommand/绑定钉钉UnionId", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:39:46.7767556+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\绑定钉钉UnionId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/获取CorpId", @@ -2416,15 +2354,6 @@ }, { "ModuleName": "ServerCommand/解绑钉钉", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:40:26.7506501+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\解绑钉钉.json" - ] + "ModuleType": 15 } ] \ No newline at end of file diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip new file mode 100644 index 00000000..439281c8 Binary files /dev/null and b/Plugin/内容编辑器-9_0_103_0.zip differ diff --git a/Plugin/用户管理命令-10_0_2_0.zip b/Plugin/用户管理命令-10_0_2_0.zip deleted file mode 100644 index 00497faa..00000000 Binary files a/Plugin/用户管理命令-10_0_2_0.zip and /dev/null differ diff --git a/ServerCommands/钉钉/绑定钉钉UnionId.json b/ServerCommands/钉钉/绑定钉钉UnionId.json index 9c88a032..a219d6f9 100644 --- a/ServerCommands/钉钉/绑定钉钉UnionId.json +++ b/ServerCommands/钉钉/绑定钉钉UnionId.json @@ -33,7 +33,7 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "用户名", "ParameterValue": "%CurrentUser%", - "ID": "cdcc7c8debd74ec9b3b021ec1c7fb4bd" + "ID": "7293ce1d75204871ae6cf8fe3c8e26e1" }, { "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", @@ -141,20 +141,24 @@ }, "CommandList": [ { - "$type": "UserManagementCommands.Commands.UpdateUserCommand, UserManagementCommands", - "UserName": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=用户名" - }, - "ExtendedProperties": [ - { - "Name": "DingTalkUnionId", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=UnionId" + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + }, + "ExtendedProperties": [ + { + "Name": "DingTalkUnionID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionId" + } } - } - ] + ] + } }, { "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", @@ -171,7 +175,7 @@ ] } ], - "ID": "ee0ce6a3-05bc-499a-a307-f536cbfb0fca" + "ID": "b961632e-9cdd-48ce-b57f-e30e59833172" }, { "CommandList": [ @@ -209,7 +213,7 @@ ] } ], - "ID": "046db854-37fb-4bf0-a918-dbd7da13b032" + "ID": "ec4555e6-d7f1-4263-9dcc-aa6c3fc93535" }, { "CommandList": [ @@ -227,17 +231,17 @@ ] } ], - "ID": "12186e8d-a6d2-4377-9486-2b457b0c3ccc" + "ID": "d1739660-72ff-4779-b53a-c7b995dc3086" } ] } ], - "ID": "aea4e1d0-e4e1-4ae5-b192-fc1ad762c08a" + "ID": "55264eed-1731-4cbd-8988-61cb8c24111d" } ] } ], - "ID": "940f7a89-7f9e-4d3f-ab90-2754c9dba2a2" + "ID": "7aad1b9f-da32-452d-b850-85df08483cb4" }, { "CommandList": [ @@ -258,7 +262,7 @@ ] } ], - "ID": "d30a406a-69e7-4cd8-a891-7c6877a87f81" + "ID": "34ad4114-10c7-400e-8a20-e32f5ed533c3" } ] } diff --git a/ServerCommands/钉钉/解绑钉钉.json b/ServerCommands/钉钉/解绑钉钉.json index 43439e9d..44353c98 100644 --- a/ServerCommands/钉钉/解绑钉钉.json +++ b/ServerCommands/钉钉/解绑钉钉.json @@ -42,7 +42,7 @@ }, "ExtendedProperties": [ { - "Name": "DingTalkUnionId", + "Name": "DingTalkUnionID", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=\"\"" diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index dd7689b8..18805a71 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ