diff --git a/.collaboration b/.collaboration index dcf88e26..687329bd 100644 --- a/.collaboration +++ b/.collaboration @@ -1094,17 +1094,7 @@ }, { "ModuleName": "PCPage/其他登录方式", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:49:53.173602+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\其他登录方式.json", - "Pages\\内建页面\\其他登录方式.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改密码", @@ -1708,42 +1698,15 @@ }, { "ModuleName": "Notification/系统信息更新", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:03:43.0071118+08:00", - "ModuleType": 34, - "ToRemoveFiles": [ - "Notifications\\系统信息更新.json" - ] + "ModuleType": 34 }, { "ModuleName": "Notification/AI流消息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:04:00.6776649+08:00", - "ModuleType": 34, - "ToRemoveFiles": [ - "Notifications\\AI流消息.json" - ] + "ModuleType": 34 }, { "ModuleName": "Notification/提醒通知", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T23:03:51.9574043+08:00", - "ModuleType": 34, - "ToRemoveFiles": [ - "Notifications\\提醒通知.json" - ] + "ModuleType": 34 }, { "ModuleName": "ApplicationSetting", @@ -2411,16 +2374,7 @@ }, { "ModuleName": "ServerCommand/钉钉登录绑定账号并登录", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T22:56:46.701118+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\钉钉登录绑定账号并登录.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/绑定账号", diff --git a/Notifications/AI流消息.json b/Notifications/AI流消息.json index d3ec2561..96f96731 100644 --- a/Notifications/AI流消息.json +++ b/Notifications/AI流消息.json @@ -17,7 +17,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] diff --git a/Notifications/提醒通知.json b/Notifications/提醒通知.json index 8feca45b..d8265dc1 100644 --- a/Notifications/提醒通知.json +++ b/Notifications/提醒通知.json @@ -24,7 +24,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] diff --git a/Notifications/系统信息更新.json b/Notifications/系统信息更新.json index b5b2aea5..f5d10921 100644 --- a/Notifications/系统信息更新.json +++ b/Notifications/系统信息更新.json @@ -17,7 +17,7 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.ServerNotification.ServerNotificationPermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] diff --git a/Pages/内建页面/其他登录方式.json b/Pages/内建页面/其他登录方式.json index 4ca0df25..7620ae70 100644 --- a/Pages/内建页面/其他登录方式.json +++ b/Pages/内建页面/其他登录方式.json @@ -299,8 +299,7 @@ } ] }, - "value": "0", - "compareType": 1 + "value": "0" }, "CommandList": [ { @@ -308,7 +307,7 @@ "PageName": "工作台首页" } ], - "ID": "091379a1-420c-4e5d-8704-5b5fd0b31607" + "ID": "a1a70926-708c-4496-8459-5576848bff3f" }, { "Condition": { @@ -340,12 +339,25 @@ ] } ], - "ID": "8879dd46-a201-4118-9446-8f8ae9b21d4e" + "ID": "e17a377b-0f66-422d-b545-f9275f55c05b" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!msg" + } + } + ], + "ID": "e869fa63-c88f-4128-824d-c9722151414b" } ] } ], - "ID": "cdaa0544-c92a-4d70-b0bf-693f89ecde11" + "ID": "a3ad31fa-dfc5-456a-a4a9-42d1e035e39d" }, { "CommandList": [ @@ -358,12 +370,12 @@ } } ], - "ID": "d0d27753-c0dd-4d58-a55b-eb39aef3dd06" + "ID": "be7de23d-d7d2-485b-968b-a32ab7ed767b" } ] } ], - "ID": "39f1bdff-5bcf-4fcd-81b1-c7af82887c34" + "ID": "5790be49-0c44-40ae-be21-c4986bfc0e17" }, { "CommandList": [ @@ -373,7 +385,7 @@ "redirect_uri": "https://www.yugasoft.cn/clue/dingtalkLogin" } ], - "ID": "979d8cb7-c7fe-4efd-8c91-3c29aee3bc40" + "ID": "a01140e2-28b5-4abd-8c6c-c35c3f9beacc" } ] } @@ -496,7 +508,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "5d4409bf-a92c-4781-9816-50a09b5848d3" + "ID": "8b5e59f7-59fb-42ed-925d-5ef8cafea91f" } ] } @@ -549,4 +561,4 @@ "Size": "56,68" } ] -}//gt0Ib+REtuFYURi13zRENQk0l2nX5VbqV3Bh8dYDyu3FsIwhWvTSZdL4JPcPSNFtWY/2eMz2pTW37HM9ohuayjzZCFHasIM9BXA6DuHA1RGKmhQB3nGqrT+2XuLcQ1sXwDnmMHFfgSULJjHVAl+XkZzWKi3f55uJvG6MkotOq4FpeVbq4H1+GVhT/oNqGjSyoc9Y5ClsoppqhlYHlnBq04wBH4Owzso0dbGi3anUrMSVqFPOKBe5kxEM6lJOgK03cTpVQ4AxLL2h8ovzY8XeLgCCD3horSo0PsWXdQGOLfVFZ8xM0KqWG59OF/z/NsA3d8f39pbEV9QSr64VeuR2Af7lws55WVdW+MgnOd81M9O/zItKn7SbrOyHcHTbPjyGxmUjJzdcValgMLeRo9EidF4ftX9K9yidfrHW+7erzsuVnF0hoJL4fCokxo4G7dgv1O7OeBXyizYyBubod3PCemSTxwklQ/qs0oUmSVJ4SnZsRKBHCjNfuZVJS4+lnmuoJmp81hYNOGu1pt8uvDz3CV+0SJVtsIS25hOmFnL52jMqD4M2F0+PkEbOoz3dnWMjU2hboLxQQFP9Bo1iHczXEiBGfRnYK3TTV5xImh7EAhfC3v6rnzUVfHd8Fw1hSld6Wj2cw6TReqVgGgPYqKr+bS31dRt121g5Oy/MFv0ZgsT6JI2IM6sSS1lptrPnRVz3q+mR1zuT6Fw1USBE/swcrPbwuCzu9y0YaaxeVG9z3PwtvDq/UEryIriv7/oS3hbATEOLDf2lNbtblLJX+IceYH7KMT/KvvvG+u2F9ADOiWF4dDqw+jKUIAAT1ryVn/uEdnWL+1feOUwV/SIj0dDJmjfSp2LLJDp9WNXUpgTpkxbssY3jKb842X2RF7cmY1BARzHnmoOqSVOHTles4PbVKg==|920 \ No newline at end of file +}//szLP+Osy6JJKM+vYn4y/7ohVZtFym3p1ADCoHyEVngvrAdfFv18sZS2SIRWNrbR3mc+wcwzR14AM5PRZ9/UPsyJiKj3282yZKGqQiL7E6FIA3r/B9BkFp9J1wkwdylXCXcitmcVwjj8rrbI+DebMj+B301vXs9qyeDu61NnJae0nvuJmyEUmorOKIz5/Rsma83GWhMKXPSQRPJOU5kiFfgYjVhAYCE1F9v6g7TFzizN4uwbEndHN9PEkXwoRJOuLmhHydxJB9uu4yGr25NqY+tU1dst+W39lphlwIwJ4VEr99LuSMoDmI9QwkgiF/4HVoairUJZtjvII7elDWWB3VuyYqQcJt2wqv0ar/2+OkWShlXUPpYbfawjrIsYWHpnHGqWbYUm8zalwY8l9qNgZ+ZYiG0hFh1c69IDZKy9h78vQHFTRN0rrHcvo4OTfoFq1SdR39vmGxwH2NCtSy6dUoA/o9H5GT1ufplc8draCpeOrB1ND5RMuzqVNWTpNJrxrFKRQCEu3lbem4zaabJXX7IIu5kxEf30Qj1SdrGFMi0h1lBIMSPjCyOj5buT2v7RrddElJ5gfdpbgU+Dsbdn37l9ihfEUWexTPTlDMlgeoXHEAmM32uIyTXSzF4WGrP9XIzb18cDlIsXkXQi3VOrJ1yqJs+QFP5xqc8wGEa+FJISa/n15skhT4rEd9mROGXhmSMIwqQdUXwkAa5EMBO7HA46nnnI76pREFSoewP3210L0x73JYa8xPtJXz7n5UyeRoyBWEJ5oR17zUIcFbfbhRolaj2diTyzfwT9neuUOR7Uqin0Z6a1GJBa/WgQRoBTy0ShRY8UcuY1qhVhCKKlO7jIEWUR4oXiVDk9kluG9Ylpnuq85JSobEkeZwXoPhb+ZvLyN8NVyIbwkWSgTCgIIyA==|920 \ No newline at end of file diff --git a/ServerCommands/钉钉/钉钉登录绑定账号并登录.json b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json index 65105307..093892f7 100644 --- a/ServerCommands/钉钉/钉钉登录绑定账号并登录.json +++ b/ServerCommands/钉钉/钉钉登录绑定账号并登录.json @@ -48,6 +48,57 @@ "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", "TryCommandPart": { "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "user", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "bd764706-dd08-43b9-9feb-e247279a4d48", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "2aa3fe17-bed7-44eb-b3d3-0e637a897bdf" + }, + "ColumnName": "用户名" + }, + { + "GUID": "d29fda43-7af7-4f25-ac3d-a33fb3aec17a", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "f743ac46-842c-4e07-8b4b-aee23f2ef108" + }, + "ColumnName": "全名" + }, + { + "GUID": "68e937d2-7e00-4827-837b-fd2be6e0f316", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "邮件", + "GUID": "0dcac6c4-a0eb-48b1-ae6d-1e70bfb57000" + }, + "ColumnName": "邮件" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "9edc3b51-a2ef-44c4-9ba2-af242e5c163f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户名" + } + }, + "TopCount": "1" + }, + "ID": "7157d69e949042e7b5ac85d144b289a3" + }, { "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", "OperationType": "101", @@ -73,6 +124,14 @@ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=用户名" }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=user.全名" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=user.邮件" + }, "ExtendedProperties": [ { "Name": "DingTalkUnionID",