diff --git a/.collaboration b/.collaboration index d6318ee7..7323e189 100644 --- a/.collaboration +++ b/.collaboration @@ -918,17 +918,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:32:17.6423874+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", @@ -1672,16 +1662,7 @@ }, { "ModuleName": "TaskScheduler/应用启动时", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:19:43.1649111+08:00", - "ModuleType": 16, - "ToRemoveFiles": [ - "SchedulerTasks\\事件任务\\应用启动时.json" - ] + "ModuleType": 16 }, { "ModuleName": "SchedulerTasks/定时任务", @@ -1729,17 +1710,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:14:53.5328637+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -2283,48 +2254,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:36:14.5887066+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "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\\内容编辑器-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\\异步运行命令-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.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2400,72 +2330,30 @@ }, { "ModuleName": "ServerCommands/钉钉", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:13:23.7751944+08:00", "ModuleType": 20 }, { "ModuleName": "ServerCommandPrivate/初始化钉钉配置", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:19:36.6536836+08:00", "ModuleType": 27 }, { "ModuleName": "ServerCommand/通过免登码获取用户信息", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:21:31.1276629+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommandPrivate/通过免登码获取用户信息", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:23:52.0999034+08:00", "ModuleType": 27 }, { "ModuleName": "ServerCommand/绑定钉钉UnionId", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:32:17.6420983+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/获取CorpId", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:28:45.7961863+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/解绑钉钉", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T19:34:07.1591585+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index fa28b888..4c7038c6 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -12,6 +12,10 @@ { "Name": "全局_Gitee", "Value": "{\"client_id\":\"c7d05fcbaf78ad728fcc0267d081ae6c50dc667667758a0933525d4cbe09ed90\",\"client_secret\":\"b4d40db2155ca530e5771b37a2fb67161d4106c64df28f32504b4e3bcfb81313\",\"回调地址\":\"https://develop.gridfriend.cn/clue/ServerCommand/GitCallback\"}" + }, + { + "Name": "全局_钉钉", + "Value": "{\"corpId\":\"ding0cec4a8a821681c135c2f4657eb6378f\",\"AgentId\":\"3174653522\",\"AppKey\":\"dingus6w0kbp5wgiiepu\",\"AppSecret\":\"2nbEQx6wUWlSm1l1mzkVEvf0TWO77tQM7Thj7OycnOVK7UQWhrI4U717WgWTTGXg\"}" } ], "WebSitePort": 26489, @@ -20,14 +24,13 @@ "ProcessDataConnectionSet": { "ExternalDatabaseId": "业务表" }, - "StartPage": "首页", + "StartPage": "工作台首页", "StartDateFiscalYear": 1, "BaseOnStartingMonth": true, "ProcessUserInfoDisplayMode": 1, "SuppressedWarningMessages": [ "项目首页->页面加载命令->Notify加载, 在命令条件之后的命令可能不会被执行,因为此时页面可能已经跳转到新的页面。", - "项目首页->页面容器(A2), 页面容器没有设置子页面", - "数据表, 有部分连接到外部数据库的数据表没有检查过连接状态,如果无法连接到数据库可能会导致数据无法在页面上显示。如需确认数据库的连接状态,请点击数据表右键菜单里的“刷新”" + "项目首页->页面容器(A2), 页面容器没有设置子页面" ], "SyncUserInfoCacheForBuiltInView": false, "MultipleLanguageSettings": { diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index c45b1197..d7e18a1c 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -403,12 +403,12 @@ } } ], - "ID": "798fe1aa-87e2-492d-83d7-daf57c6dd9d8" + "ID": "18b4b711-5d27-45fb-88e8-cbe8f599a755" } ] } ], - "ID": "c1c99258-f376-4255-8681-3bb7075bea76" + "ID": "9144988f-b996-49af-9d3c-5037f3415391" } ] } @@ -557,12 +557,12 @@ } } ], - "ID": "05707b8b-4471-42f8-bcd4-98e9ef397c1a" + "ID": "2d221a06-6658-419e-9596-69e95ea79c75" } ] } ], - "ID": "e47bb419-34cd-4381-8df8-171b5ad8b4fe" + "ID": "320df583-af7c-4d17-8f20-3f5dc936b740" } ] } @@ -742,12 +742,12 @@ } } ], - "ID": "f2f89395-d95e-4029-a303-5ec13a336c9a" + "ID": "357cf42e-9433-446b-b3b2-671a8b1c864a" } ] } ], - "ID": "74721a77-bdca-4ccb-9adf-1b06575026d8" + "ID": "08b23816-8e54-4253-9ed3-56452bd12d1c" } ] } @@ -891,12 +891,12 @@ } } ], - "ID": "6d53538a-b213-4e3c-8698-37f3973747e4" + "ID": "f5354424-d468-40de-8210-d4079e32de32" } ] } ], - "ID": "42d2dacf-0f08-4bc4-9762-82ad91cee66d" + "ID": "ffe9e3f0-f764-4317-8669-a040bc76c4ce" } ] } @@ -1130,7 +1130,7 @@ "ReloadData": true } ], - "ID": "c4bd7db4-cd51-4753-9490-a6a0ea093d32" + "ID": "a511b455-0227-4139-a81c-9cdbebcf6921" }, { "CommandList": [ @@ -1145,12 +1145,12 @@ "BtnText": "知道了" } ], - "ID": "3709f584-e096-4d4e-84e1-e696d4084980" + "ID": "f25acbae-384b-4731-a9e6-65e4b2910877" } ] } ], - "ID": "bd15c9cf-7e0e-4f7a-9acb-9a08494bdb56" + "ID": "7eb09893-e07d-4d6c-99f4-af55390f4941" }, { "CommandList": [ @@ -1162,7 +1162,7 @@ "BtnText": "知道了" } ], - "ID": "08185035-e6ed-43cc-85de-0e2e9085e9d1" + "ID": "e8ede701-9300-4a29-b75e-c9d3ee1ea6f5" } ] } @@ -1180,6 +1180,196 @@ "16,5": { "CellType": { "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", + "currentUserProperty": { + "UserProperty": "DingTalkUnionID", + "PropertyType": 4 + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取CorpId", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "CorpId", + "ResultTo": { + "SerializeProperty": "CorpId" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "DingTalkPlugin.RequestAuthCode, DingTalkPlugin", + "CorpId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!CorpId" + }, + "Code": "授权码" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "绑定钉钉UnionId", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "免登码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!授权码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "UnionId", + "ResultTo": { + "SerializeProperty": "='个人中心-基本信息'!J17" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + } + ], + "ID": "ff16ff08-3abd-4ea3-959c-c44bd591b426" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "7012a1d0-ac5a-41bc-a9bc-32c713e51c65" + } + ] + } + ], + "ID": "b6df8347-3d2b-4a9e-ba44-aa11788003c4" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "解绑钉钉", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "用户名" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "='个人中心-基本信息'!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "7041e110-0f00-4414-83fb-589d529e3bbf" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='个人中心-基本信息'!msg" + } + } + ], + "ID": "1130ba9d-ec2f-48cd-b71f-497f96a26ee2" + } + ] + } + ], + "ID": "e1e4173e-b875-43c3-85d2-16ee41652f6c" + } + ] + } + ], "Text": "未绑定", "ClickMode": 1, "IsDisabled": true, @@ -1956,4 +2146,4 @@ "Formula": "'个人中心-基本信息'!$F$11" } ] -}//Strh0xU14QD30L78KDfprk85TQ5s7LAJyjRSBGN2Sb6BAM8Gia7l78Kt2P0qHMUDM4lBBPEXeZ3EZ7KiYEHNG7y07ZhGwtVsHTyABn8cImdCJn+VyXYp+/jTj5Xy00DlhNjhLTWEXPKBH0cvB82v7QfBEtBt3gpLGb56TMDlCywatJ/N3R3eXG+kwrN7BNdcMPA5Ps8UtGLxarMrdq1FDU5RmCcEX0KDl3wOW5R4EiSV6tcJy36MKkwNaz9jVcur1ebu+JjFdhX/P7/ABt8NuBAO7MO2R3xLRA2YiG6/zNFSaDBtkk8JCLdn9unpTBbHv6bOiXIqwoM79/n5iN8wOC1UIga9qHRybg4IzDEDG0A7GIqznEdGL50qzN6c99paGAbm6J0+yLbp2DexwiS+9nQhStjJ6/q3RRsaF1JeHxWyqvhxr4UMF76iNh2qxPtr8+PS5tFvNake/k0Na92MPiIjcjiYpmXDSBbB/a/mGO25QIXT1R4CRM48elNTZlWeseXM0z/CJ9p+P3wzm/bw92QaQxijfY135UO0j+mbISXJQVaCrdGMnig8l9VTjNy9DwrRbGumACAoGTs7e3m77WpZViHAWHLbqZEDK+galwniRUlgN+usNERnCUKJO4hsM1qA1b+HsY/ivQEqD2k9uC8j20dbN2Gsp6a0RDh74T7n1DrWOLA5AenzSo+Z0B89acA+CcnWkPEaTvAC7ug82GFelX1YfhLUrLqeeN1WR8cVDSDr/KgjFEQ+AbLpijmfED3tQIdGXI9W0dFhXEKeYVShz7AGC3kA+963d62d+SdUE2OCXh1Y6c14onMcKj5PmI7T/2s2FI5QzkENblZ1JQGMVlcQRWz+oDJr+QiUDLnIleD9IqmbpZmwybe/xnIbm/sdPiqGfTxCKrDnGtXUVQ==|920 \ No newline at end of file +}//K5Msi+EQMNH0B7NlM3lv7aU/hGe9vZ1Z88ame09r4W+QHIUxOUrayW8RfTeVsteUjyAhK2S4uE5XLUEqO+Yqs/WDVssjo+fRy9URn+dnTf4OMAc8wDSkpuxUKJmURogfRKHlR/dNcelaFy0XY+Ow9sxmRmJ/wl8kI82bmL1HdoeKmHrp2Ws7YyI6qIPXqR6inyhkBTXDB9As5lwGlTLykaZZLyoOaf/lYEoqY0ZTepmeakOJeoZZDWbvh+CAnc0ekvIEHbXPPISDgJ4LvjEkGOafxihCVkfX+7/XHc8tIosYmhBu4yaQZcT/b/C0tILordgSUbSbgRrXz6RT1iTrETjiBdShyyhaYLMA/2/B3S8g+HnvQWO2dDnbfKeKcNszb7pEH2qPKQcrzplxTSjkMmEbq+HjJeXu18CiDw5H4xVQ9LtGWZepLth633ihuWJuNwQ91Xl5M2UEtohkWjN6+Uxixhd2nyMOTSwn4lNmsnuo0e+QsbDh9xy5Z3+YWWrBIXhV1qwcLdFfmuiqz03h4kcsfLrFk7UIiwPXqeq8hlXJX1zWj40W591ukPY9nNjllEPLIuvDtb2jtML1OHeKxbwiBW7Q/yc5jaLejctbaUHhAlHMSN4MG76VRtaW8FwgijolDQvlFASTlSZTFsLtSA2YRUPzcYU27D78KnIpAGxND/oRpk1IWW2GJtxT/E922mVolj7QpjhjpzLRD7aKhhmGPcE7mfuDKamOSRTcKt22RCE5e0beiVcaRbcL9JOwyJDbtMhbLvs+eo0HgQ5B+FblqVBopS68gHrRb86BzC8zip9EKGu3VyhA1pzrVVYiY0draQB4T1qftXKL+zaGTyOB8ZBhC16pXbR2hvn/X0W7nMwfa6Sjs9txvXQTCh01ePyIBWW0clv/LbUCEydVYg==|920 \ No newline at end of file diff --git a/Plugin/DingTalkPlugin.zip b/Plugin/DingTalkPlugin.zip new file mode 100644 index 00000000..b147a4f8 Binary files /dev/null and b/Plugin/DingTalkPlugin.zip differ diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip deleted file mode 100644 index 439281c8..00000000 Binary files a/Plugin/内容编辑器-9_0_103_0.zip and /dev/null differ diff --git a/Plugin/用户管理命令-10_0_2_0.zip b/Plugin/用户管理命令-10_0_2_0.zip new file mode 100644 index 00000000..00497faa Binary files /dev/null and b/Plugin/用户管理命令-10_0_2_0.zip differ diff --git a/SchedulerTasks/事件任务/应用启动时.json b/SchedulerTasks/事件任务/应用启动时.json index a3059f1e..50cec21e 100644 --- a/SchedulerTasks/事件任务/应用启动时.json +++ b/SchedulerTasks/事件任务/应用启动时.json @@ -19,6 +19,18 @@ "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 new file mode 100644 index 00000000..0b86c0e4 --- /dev/null +++ b/ServerCommands/钉钉/初始化钉钉配置.json @@ -0,0 +1,43 @@ +{ + "Name": "初始化钉钉配置", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon" + } + ], + "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_钉钉" + }, + "SampleJson": "{\r\n \"corpId\": \"ding0cec4a8a821681c135c2f4657eb6378f\",\r\n \"AgentId\": \"3174653522\",\r\n \"AppKey\": \"dingus6w0kbp5wgiiepu\",\r\n \"AppSecret\": \"2nbEQx6wUWlSm1l1mzkVEvf0TWO77tQM7Thj7OycnOVK7UQWhrI4U717WgWTTGXg\"\r\n}", + "ToParameter": "钉钉配置" + }, + { + "$type": "DingTalkPlugin.Init, DingTalkPlugin", + "AppID": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.AgentId" + }, + "CorpId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.corpId" + }, + "AgentId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.AgentId" + }, + "AppKey": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.AppKey" + }, + "AppSecret": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.AppSecret" + } + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/绑定钉钉UnionId.json b/ServerCommands/钉钉/绑定钉钉UnionId.json new file mode 100644 index 00000000..9c88a032 --- /dev/null +++ b/ServerCommands/钉钉/绑定钉钉UnionId.json @@ -0,0 +1,271 @@ +{ + "Name": "绑定钉钉UnionId", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "免登码", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "用户名", + "ParameterValue": "%CurrentUser%", + "ID": "cdcc7c8debd74ec9b3b021ec1c7fb4bd" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "通过免登码获取用户信息", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "AuthCode", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=免登码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "钉钉UnionId", + "ResultTo": { + "SerializeProperty": "UnionId" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + } + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "已有用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "859861e5-a372-47ad-a99f-e9d3e3c9b06e", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "cb83f460-0a24-4f8c-8b34-791984246e2b" + }, + "ColumnName": "用户名" + }, + { + "GUID": "e4f5c193-f005-4a55-baa7-caa38b82dec0", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "92ccdb26-a718-4d80-bef6-9ed36c5a701c" + }, + "ColumnName": "全名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "41af5aa1-0d6f-4353-8980-5cecbdd4353a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionId" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "84b3ab71967c4735889755aac5eaf46d" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=已有用户" + } + }, + "value": "%Null%" + }, + "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": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "绑定成功", + "CustomReturns": [ + { + "ReturnPropertyName": "UnionId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionId" + } + } + ] + } + ], + "ID": "ee0ce6a3-05bc-499a-a307-f536cbfb0fca" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=已有用户.用户名" + } + }, + "value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "绑定成功", + "CustomReturns": [ + { + "ReturnPropertyName": "UnionId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=UnionId" + } + } + ] + } + ], + "ID": "046db854-37fb-4bf0-a918-dbd7da13b032" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"当前钉钉账号已被\"&已有用户.全名&\"的账号绑定,请先解绑后再试!\"" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "UnionId" + } + ] + } + ], + "ID": "12186e8d-a6d2-4377-9486-2b457b0c3ccc" + } + ] + } + ], + "ID": "aea4e1d0-e4e1-4ae5-b192-fc1ad762c08a" + } + ] + } + ], + "ID": "940f7a89-7f9e-4d3f-ab90-2754c9dba2a2" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "UnionId" + } + ] + } + ], + "ID": "d30a406a-69e7-4cd8-a891-7c6877a87f81" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "UnionId" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/获取CorpId.json b/ServerCommands/钉钉/获取CorpId.json new file mode 100644 index 00000000..24632d7d --- /dev/null +++ b/ServerCommands/钉钉/获取CorpId.json @@ -0,0 +1,55 @@ +{ + "Name": "获取CorpId", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + } + } + ], + "Commands": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局_钉钉" + }, + "SampleJson": "{\r\n \"corpId\": \"ding0cec4a8a821681c135c2f4657eb6378f\",\r\n \"AgentId\": \"3174653522\",\r\n \"AppKey\": \"dingus6w0kbp5wgiiepu\",\r\n \"AppSecret\": \"2nbEQx6wUWlSm1l1mzkVEvf0TWO77tQM7Thj7OycnOVK7UQWhrI4U717WgWTTGXg\"\r\n}", + "ToParameter": "钉钉配置" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取成功", + "CustomReturns": [ + { + "ReturnPropertyName": "CorpId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=钉钉配置.corpId" + } + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "CorpId" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/解绑钉钉.json b/ServerCommands/钉钉/解绑钉钉.json new file mode 100644 index 00000000..43439e9d --- /dev/null +++ b/ServerCommands/钉钉/解绑钉钉.json @@ -0,0 +1,60 @@ +{ + "Name": "解绑钉钉", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "用户名", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$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": "=\"\"" + } + } + ] + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "解绑成功" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/通过免登码获取用户信息.json b/ServerCommands/钉钉/通过免登码获取用户信息.json new file mode 100644 index 00000000..48f9ee7a --- /dev/null +++ b/ServerCommands/钉钉/通过免登码获取用户信息.json @@ -0,0 +1,46 @@ +{ + "Name": "通过免登码获取用户信息", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.InvokeTriggerSaveData, ServerDesignerCommon", + "Parameters": [ + { + "Name": "AuthCode", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.Getuserinfo, DingTalkPlugin", + "Code": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=AuthCode" + }, + "UserInfo": "用户信息" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取成功", + "CustomReturns": [ + { + "ReturnPropertyName": "钉钉UnionId", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.unionid" + } + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "钉钉UnionId" + } + ] +} \ No newline at end of file