diff --git a/.gitignore b/.gitignore index cd8e2d0e..fdea6a30 100644 --- a/.gitignore +++ b/.gitignore @@ -397,10 +397,9 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml .idea/ -!src/backend/CloudCode.DataGrip/.idea # User Define dist/ *.[Dd]esigner.cs *.db -/assets/res/Ln.resx +/assets/res/Ln.resx \ No newline at end of file diff --git a/NetAdmin.sln b/NetAdmin.sln index bed18497..c123ea5e 100644 --- a/NetAdmin.sln +++ b/NetAdmin.sln @@ -108,14 +108,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{E80A10 README.md = docker/README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Domain", "src\backend\NetAdmin\NetAdmin.SysComponent.Domain\NetAdmin.SysComponent.Domain.csproj", "{51D6E603-0749-4A11-A78C-9E5BB127E03A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Domain", "src\backend\YourSolution.AdmServer.Domain\YourSolution.AdmServer.Domain.csproj", "{932520DF-D312-415A-A128-1117F8221D68}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YourSolution.AdmServer.Infrastructure", "src\backend\YourSolution.AdmServer.Infrastructure\YourSolution.AdmServer.Infrastructure.csproj", "{C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.SysComponent.Infrastructure", "src\backend\NetAdmin\NetAdmin.SysComponent.Infrastructure\NetAdmin.SysComponent.Infrastructure.csproj", "{48EE6FC4-B64A-40D3-B889-36837E067880}" -EndProject ##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gurion", "refs\Gurion\src\Gurion\Gurion.csproj", "{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}"#refs ##EndProject#refs ##Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql", "refs\FreeSql\FreeSql\FreeSql.csproj", "{3C65DA42-877D-46FF-B754-C12214302A29}"#refs @@ -185,10 +181,6 @@ Global {00604162-C444-478B-B773-3AB23C856CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {00604162-C444-478B-B773-3AB23C856CA7}.Release|Any CPU.Build.0 = Release|Any CPU - {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51D6E603-0749-4A11-A78C-9E5BB127E03A}.Release|Any CPU.Build.0 = Release|Any CPU {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {932520DF-D312-415A-A128-1117F8221D68}.Debug|Any CPU.Build.0 = Debug|Any CPU {932520DF-D312-415A-A128-1117F8221D68}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +189,6 @@ Global {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA}.Release|Any CPU.Build.0 = Release|Any CPU - {48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48EE6FC4-B64A-40D3-B889-36837E067880}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48EE6FC4-B64A-40D3-B889-36837E067880}.Release|Any CPU.Build.0 = Release|Any CPU ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU ##{CCD098FE-4F95-4FA4-8CC0-9A6DE921FBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -238,10 +226,8 @@ Global {19872A4C-3C9A-4C62-A33B-74F5B8D6F77C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {C2CC1596-3BEE-43EA-A9BE-4EDE5716296C} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {79409163-5006-405D-AC96-406FA0AD77B7} = {4DAF9366-855F-46BB-AE4C-660C92FA0697} - {51D6E603-0749-4A11-A78C-9E5BB127E03A} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {932520DF-D312-415A-A128-1117F8221D68} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86} {C3DE6F6A-D1FC-4B8E-9033-980FBEBBD2BA} = {12AE5B4B-CB1A-498E-83B8-04E201E31D86} - {48EE6FC4-B64A-40D3-B889-36837E067880} = {3F23258D-8299-4992-9F51-2EE9B52CF9D2} {3C6F049E-3EE8-4D66-9AFF-E8A369032487} = {1129FE25-466B-4F4F-85FC-3752664245E1} EndGlobalSection EndGlobal \ No newline at end of file diff --git a/README.md b/README.md index a5f252d7..0851439a 100644 --- a/README.md +++ b/README.md @@ -70,29 +70,27 @@ npm run dev ```mermaid flowchart TD -sys-host["NetAdmin.SysComponent.Host\n（系统组件：主机层）"] -sys-cache["NetAdmin.SysComponent.Cache\n（系统组件：缓存层）"] -sys-app["NetAdmin.SysComponent.Application\n（系统组件：应用层）"] -sys-domain["NetAdmin.SysComponent.Domain\n（系统组件：数据实体层）"] -sys-infra["NetAdmin.SysComponent.Infrastructure\n（系统组件：基础设施层）"] -host["NetAdmin.Host\n框架：主机层\n（.Net自托管主机程序）\n（输入输出格式化）\n（数据校验、鉴权）\n（...所有HTTP管道过滤器中间件）"] -cache["NetAdmin.Cache\n框架：缓存层\n（基于Redis或MemoryCache的缓存策略实现）"] -app["NetAdmin.Application\n框架：业务应用层\n（内部服务增删改查）\n（外部服务增删改查）\n（...所有业务用例的计算与组合逻辑的模块化）"] -domain["NetAdmin.Domain\n框架：数据实体层\n（数据库关系实体映射）\n（DTO数据传输对象）\n（...所有数据模型的抽象与封装）"] -infra["NetAdmin.Infrastructure\n框架：基础设施层\n（第三方组件和Nuget包引用）\n（公共构建和程序运行配置）\n（公共常量枚举异常定义）\n（全球化化和多语言）\n（...所有公共Utility工具）"] -biz-host["YourSolution.XXX.Host\n（业务实例：主机层）"] -biz-cache["YourSolution.XXX.Cache\n（业务实例：缓存层）"] -biz-app["YourSolution.XXX.Application\n（业务实例：应用层）"] -biz-domain["YourSolution.XXX.Domain\n（业务实例：数据实体层）"] -biz-infra["YourSolution.XXX.Infrastructure\n（业务实例：基础设施层）"] +sys-host["NetAdmin.SysComponent.Host\n系统组件：主机层"] +sys-cache["NetAdmin.SysComponent.Cache\n系统组件：缓存层"] +sys-app["NetAdmin.SysComponent.Application\n系统组件：应用层"] +host["NetAdmin.Host\n框架：主机层\n（.Net自托管主机程序）\n（输入输出格式化）\n（数据校验、鉴权）\n（...所有HTTP管道过滤器中间件）"] +cache["NetAdmin.Cache\n框架：缓存层\n（基于Redis或MemoryCache的缓存策略实现）"] +app["NetAdmin.Application\n框架：业务应用层\n（内部服务增删改查）\n（外部服务增删改查）\n（...所有业务用例的计算与组合逻辑的模块化）"] +domain["NetAdmin.Domain\n框架：数据实体层\n（数据库关系实体映射）\n（DTO数据传输对象）\n（...所有数据模型的抽象与封装）"] +infra["NetAdmin.Infrastructure\n框架：基础设施层\n（第三方组件和Nuget包引用）\n（公共构建和程序运行配置）\n（公共常量枚举异常定义）\n（全球化化和多语言）\n（...所有公共Utility工具）"] +biz-host["YourSolution.XXX.Host\n业务实例：主机层"] +biz-cache["YourSolution.XXX.Cache\n业务实例：缓存层"] +biz-app["YourSolution.XXX.Application\n业务实例：应用层"] +biz-domain["YourSolution.XXX.Domain\n业务实例：数据实体层"] +biz-infra["YourSolution.XXX.Infrastructure\n业务实例：基础设施层"] biz-host-->biz-cache-->biz-app-->biz-domain-->biz-infra -sys-host-->sys-cache-->sys-app-->sys-domain-->sys-infra +sys-host-->sys-cache-->sys-app-->domain-->infra host-->cache-->app-->domain-->infra biz-host-->sys-host-->host biz-cache-->sys-cache-->cache biz-app-->sys-app-->app -biz-domain-->sys-domain-->domain -biz-infra-->sys-infra-->infra +biz-domain-->domain +biz-infra-->infra ``` ## 特别鸣谢 diff --git a/assets/res/NetAdmin.Fields.ln b/assets/res/NetAdmin.Fields.ln index ce1e80c2..c0eb7171 100644 --- a/assets/res/NetAdmin.Fields.ln +++ b/assets/res/NetAdmin.Fields.ln @@ -1,3 +1,7 @@ +上次执行时间 +上次执行状态 +上次执行耗时 +下次执行时间 不为其中之一 不以什么开始 不以什么结束 @@ -8,19 +12,31 @@ 中专 中共党员 为其中之一 +人工审核 以什么开始 以什么结束 +作业名称 +作业状态 保密 保密 信息 倒序排序 +全部数据 +公告 共青团员 出生证 +创建时间 初中 +删除 包含 博士 博士后 +发送失败 同步数据库结构 +响应体 +响应状态码 +唯一编码 +备注 外国人居留证 外部错误 大专 @@ -28,43 +44,108 @@ 大于等于 女 女 +字典内容导出 宕机 +客户端IP 小于 小于等于 小学 +已发送 已婚 +已校验 +已读 并且 成功 或者 +所属角色 +所属部门 +手机 +手机号 +执行耗时 +执行计划 护照 +指定部门数据 +按钮 +排序 +接口名称 +接口导出 +接口描述 +接口路径 插入种子数据 +操作系统 +数据范围 无效操作 无效输入 +无限权限 日期范围 +是否启用 +显示仪表板 +最后登录时间 未处理异常 未婚 +未读 +本人数据 本科 +本部门和下级部门数据 +本部门数据 +框架 比较数据库结构 +注册 +消息主题 +消息摘要 +消息类型 港澳台通行证 +用户代理 +用户名 +用户导出 +电子邮箱 男 男 +登录 +登录名 +登录日志导出 硕士 示例导出 离异 +空闲 +站内信导出 等于 等于 等于 +等待发送 管理模块 系统模块 +绑定手机号码 结果非预期 群众 自定义 范围 +菜单 +角色名称 +角色导出 +解绑手机号码 警告 +计划作业导出 +计划作业执行记录导出 +请求方式 +请求日志导出 调试 跟踪 +跟踪标识 身份证 +运行 +通知 +邮箱号 +部门名称 +部门导出 +配置导出 +重设密码 +链接 错误 随机排序 +项值 +项名 顺序排序 -高中 \ No newline at end of file +高中 +默认角色 +默认部门 \ No newline at end of file diff --git a/assets/res/NetAdmin.Statements.ln b/assets/res/NetAdmin.Statements.ln index f50f2ded..05cb90f4 100644 --- a/assets/res/NetAdmin.Statements.ln +++ b/assets/res/NetAdmin.Statements.ln @@ -1,23 +1,125 @@ +1分钟内只能发送1次 6位数字 8位以上数字字母组合 XML注释文件不存在 中文姓名 事务已回滚 事务已提交 +人机校验请求不能为空 +人机验证未通过 +作业名称不能为空 +允许的文件大小 +允许的文件格式 区号电话号码分机号 参数格式不正确 +唯一编码不能为空 +图标代码不能为空 +图标名称不能为空 +婚姻状况不正确 +字典名称不能为空 +字典目录不存在 +字典目录编号不能为空 +字典目录编号不能为空 +字典编码不能为空 +学历不正确 +密码不能为空 +密码不能为空 +密码不能为空 +密码不能为空 +已处理完毕 +已处理完毕 +已处理完毕 +并发冲突_请稍后重试 开始事务 +性别不正确 +手机号码不正确 +手机号码不能为空 +接口编码不存在 支付宝账号 +政治面貌不正确 数据库同步开始 +数据库服务器时钟偏移 数据库结构同步完成 +文件不能为空 +新密码不能为空 +新手机号码验证码不正确 无效端口号 无效证件号码 +旧密码不正确 +旧密码不能为空 +旧手机号码不正确 +旧手机号码验证码不正确 时间表达式 +时间计划不能为空 +未指定部门 +未获取到待执行任务 +模块名称不能为空 +模块类型不能为空 +模块说明不能为空 +此节点已下线 +此节点已下线 +民族不正确 +消息主题不能为空 +消息内容不能为空 +父节点不存在 +用户不存在 +用户名不能为空 +用户名不能为空 +用户名不能为空 用户名不能是手机号码 +用户名或密码错误 用户名长度4位以上 +用户头像不能为空 +用户编号不存在 +目标设备不能为空 +目标设备不能为空 +短信验证请求不能为空 +短信验证请求不能为空 +短信验证请求不能为空 种子数据插入完成 +站内信不存在 +站内信状态不正确 +站内信类型不正确 +缓存键不能为空 +网络地址不正确 +网络地址不正确 +网络地址不正确 +菜单名称不能为空 +菜单标题不能为空 +菜单类型不正确 +菜单编号不能为空 +角色不存在 +角色名称不能为空 +角色数据范围不正确 +角色编号不能为空 +角色编号列表不能为空 记录已存在 +设备类型不能为空 +证件类型不正确 +该角色下存在用户 +该部门下存在子部门 +该部门下存在用户 +请求地址不能为空 请求对象不能为空 +请求方法不正确 +请稍后重试 +请联系管理员激活账号 +读取用户令牌出错 +账号不能为空 邀请码不正确 +邮箱验证码不正确 +部门不存在 +部门名称不能为空 配置文件初始化完毕 -非JSON字符串 \ No newline at end of file +键值不能为空 +键名称不能为空 +键名称不能为空 +随机延时结束时间不正确 +随机延时起始时间不正确 +非JSON字符串 +验证数据不能为空 +验证码不正确 +验证码不能为空 +验证码目标设备类型不正确 +验证码类型不正确 +验证码类型不能为空 \ No newline at end of file diff --git a/assets/res/NetAdmin.SysComponent.Fields.ln b/assets/res/NetAdmin.SysComponent.Fields.ln deleted file mode 100644 index c95fefe1..00000000 --- a/assets/res/NetAdmin.SysComponent.Fields.ln +++ /dev/null @@ -1,81 +0,0 @@ -上次执行时间 -上次执行状态 -上次执行耗时 -下次执行时间 -人工审核 -作业名称 -作业状态 -全部数据 -公告 -创建时间 -删除 -发送失败 -响应体 -响应状态码 -唯一编码 -备注 -字典内容导出 -客户端IP -已发送 -已校验 -已读 -所属角色 -所属部门 -手机 -手机号 -执行耗时 -执行计划 -指定部门数据 -按钮 -排序 -接口名称 -接口导出 -接口描述 -接口路径 -操作系统 -数据范围 -无限权限 -是否启用 -显示仪表板 -最后登录时间 -未读 -本人数据 -本部门和下级部门数据 -本部门数据 -框架 -注册 -消息主题 -消息摘要 -消息类型 -用户代理 -用户名 -用户导出 -电子邮箱 -登录 -登录名 -登录日志导出 -空闲 -站内信导出 -等待发送 -绑定手机号码 -菜单 -角色名称 -角色导出 -解绑手机号码 -计划作业导出 -计划作业执行记录导出 -请求方式 -请求日志导出 -跟踪标识 -运行 -通知 -邮箱号 -部门名称 -部门导出 -配置导出 -重设密码 -链接 -项值 -项名 -默认角色 -默认部门 \ No newline at end of file diff --git a/assets/res/NetAdmin.SysComponent.Statements.ln b/assets/res/NetAdmin.SysComponent.Statements.ln deleted file mode 100644 index d65c5763..00000000 --- a/assets/res/NetAdmin.SysComponent.Statements.ln +++ /dev/null @@ -1,102 +0,0 @@ -1分钟内只能发送1次 -人机校验请求不能为空 -人机验证未通过 -作业名称不能为空 -允许的文件大小 -允许的文件格式 -唯一编码不能为空 -图标代码不能为空 -图标名称不能为空 -婚姻状况不正确 -字典名称不能为空 -字典目录不存在 -字典目录编号不能为空 -字典目录编号不能为空 -字典编码不能为空 -学历不正确 -密码不能为空 -密码不能为空 -密码不能为空 -密码不能为空 -已处理完毕 -已处理完毕 -已处理完毕 -并发冲突_请稍后重试 -性别不正确 -手机号码不正确 -手机号码不能为空 -接口编码不存在 -政治面貌不正确 -数据库服务器时钟偏移 -文件不能为空 -新密码不能为空 -新手机号码验证码不正确 -旧密码不正确 -旧密码不能为空 -旧手机号码不正确 -旧手机号码验证码不正确 -时间计划不能为空 -未指定部门 -未获取到待执行任务 -模块名称不能为空 -模块类型不能为空 -模块说明不能为空 -此节点已下线 -此节点已下线 -民族不正确 -消息主题不能为空 -消息内容不能为空 -父节点不存在 -用户不存在 -用户名不能为空 -用户名不能为空 -用户名不能为空 -用户名或密码错误 -用户头像不能为空 -用户编号不存在 -目标设备不能为空 -目标设备不能为空 -短信验证请求不能为空 -短信验证请求不能为空 -短信验证请求不能为空 -站内信不存在 -站内信状态不正确 -站内信类型不正确 -缓存键不能为空 -网络地址不正确 -网络地址不正确 -网络地址不正确 -菜单名称不能为空 -菜单标题不能为空 -菜单类型不正确 -菜单编号不能为空 -角色不存在 -角色名称不能为空 -角色数据范围不正确 -角色编号不能为空 -角色编号列表不能为空 -设备类型不能为空 -证件类型不正确 -该角色下存在用户 -该部门下存在子部门 -该部门下存在用户 -请求地址不能为空 -请求方法不正确 -请稍后重试 -请联系管理员激活账号 -读取用户令牌出错 -账号不能为空 -邮箱验证码不正确 -部门不存在 -部门名称不能为空 -键值不能为空 -键名称不能为空 -键名称不能为空 -随机延时结束时间不正确 -随机延时起始时间不正确 -验证数据不能为空 -验证码不正确 -验证码不能为空 -验证码目标设备类型不正确 -验证码类型不正确 -验证码类型不能为空 \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs index c02c73ef..9743e6ab 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/ApiIdAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/ApiIdAttribute.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; -namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; +namespace NetAdmin.Domain.Attributes.DataValidation; /// /// 接口编码验证器 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs similarity index 86% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs index 0f783588..b3bd1cbd 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/SpecificDeptAttribute.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; +namespace NetAdmin.Domain.Attributes.DataValidation; /// /// 数据范围为特定部门的验证器 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs index b394494a..0949ca85 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Attributes/DataValidation/UserIdAttribute.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Attributes/DataValidation/UserIdAttribute.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Attributes.DataValidation; +namespace NetAdmin.Domain.Attributes.DataValidation; /// /// 用户编号验证器 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs b/src/backend/NetAdmin/NetAdmin.Domain/Contexts/ContextUserInfo.cs similarity index 86% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Contexts/ContextUserInfo.cs index b9cfbd33..481e2133 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Contexts/ContextUserInfo.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Contexts/ContextUserInfo.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Contexts; +namespace NetAdmin.Domain.Contexts; /// /// 上下文用户信息 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs index 6fbc5e0f..716dd780 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Api.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Api.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// Api接口表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs index 06da25f7..ebf34ba2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Config.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Config.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 配置表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs index 75533fd9..aa7b39dd 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Dept.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Dept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 部门表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs similarity index 95% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs index 50f4d592..8f578b95 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicCatalog.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicCatalog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 字典目录表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs index a629a2d8..7c721761 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_DicContent.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_DicContent.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 字典内容表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs index f7800e90..41192c91 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Job.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Job.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 计划作业表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs index 72653c9f..aae15438 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_JobRecord.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_JobRecord.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 计划作业执行记录表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs index 2ac76050..af98b6ab 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_LoginLog.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_LoginLog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 登录日志表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs index 8b00b05f..72478fa8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Menu.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Menu.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 菜单表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs index f0c3b625..39201060 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLog.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLog.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 请求日志表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs index 397d22f6..d2c618c4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RequestLogDetail.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 请求日志明细表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs similarity index 83% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs index 1231a3fa..bd84defe 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_Role.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_Role.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色表 @@ -120,13 +121,18 @@ public record Sys_Role : VersionEntity, IFieldSort, IFieldEnabled, IFieldSummary /// public virtual void Register(TypeAdapterConfig config) { + // ReSharper disable InvokeAsExtensionMethod + #pragma warning disable RCS1196 + _ = config.ForType() .Map( // - d => d.Depts, s => s.DeptIds.NullOrEmpty() ? Array.Empty() : s.DeptIds.Select(x => new Sys_Dept { Id = x })) + d => d.Depts + , s => s.DeptIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.DeptIds, x => new Sys_Dept { Id = x })) .Map( // - d => d.Menus, s => s.MenuIds.NullOrEmpty() ? Array.Empty() : s.MenuIds.Select(x => new Sys_Menu { Id = x })) + d => d.Menus + , s => s.MenuIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.MenuIds, x => new Sys_Menu { Id = x })) .Map( // - d => d.Apis, s => s.ApiIds.NullOrEmpty() ? Array.Empty() : s.ApiIds.Select(x => new Sys_Api { Id = x })) + d => d.Apis, s => s.ApiIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.ApiIds, x => new Sys_Api { Id = x })) // ; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs index 5ec80fb4..ab7f0634 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleApi.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleApi.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色-接口映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs index eb5c9717..44f17fca 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleDept.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleDept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色-部门映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs index cff50425..9e4d612c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_RoleMenu.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_RoleMenu.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 角色-菜单映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs similarity index 75% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs index 53d6bdd6..3edf810c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsg.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsg.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信表 @@ -86,17 +87,26 @@ public record Sys_SiteMsg : VersionEntity, IRegister, IFieldSummary /// public void Register(TypeAdapterConfig config) { + #pragma warning disable RCS1196 + + // ReSharper disable InvokeAsExtensionMethod _ = config.ForType() .Map( // d => d.Summary, s => s.Content.RemoveHtmlTag().HtmlDe().Sub(0, 100)) .Map( // - d => d.Roles, s => s.RoleIds.NullOrEmpty() ? Array.Empty() : s.RoleIds.Select(x => new Sys_Role { Id = x })) + d => d.Roles + , s => s.RoleIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.RoleIds, x => new Sys_Role { Id = x })) .Map( // - d => d.Users, s => s.UserIds.NullOrEmpty() ? Array.Empty() : s.UserIds.Select(x => new Sys_User { Id = x })) + d => d.Users + , s => s.UserIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.UserIds, x => new Sys_User { Id = x })) .Map( // - d => d.Depts, s => s.DeptIds.NullOrEmpty() ? Array.Empty() : s.DeptIds.Select(x => new Sys_Dept { Id = x })) + d => d.Depts + , s => s.DeptIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.DeptIds, x => new Sys_Dept { Id = x })) // ; + + // ReSharper restore InvokeAsExtensionMethod + #pragma warning restore RCS1196 } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs index af545896..59595e70 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgDept.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-部门映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs index a04de438..f7d7f552 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgFlag.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信标记表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs index 05d3ee7c..26d60810 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgRole.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-角色映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs index 26c4feee..cc1b91c9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_SiteMsgUser.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 站内信-用户映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs index cab3df75..ef3765af 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_User.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_User.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 用户基本信息表 @@ -126,16 +126,24 @@ public record Sys_User : VersionEntity, IFieldSummary, IFieldEnabled, IRegister /// public virtual void Register(TypeAdapterConfig config) { + #pragma warning disable RCS1196 + + // ReSharper disable InvokeAsExtensionMethod _ = config.ForType() .Map(d => d.Password, s => s.PasswordText.Pwd().Guid()) .Map(d => d.Token, _ => Guid.NewGuid()) .Map( // - d => d.Roles, s => s.RoleIds.NullOrEmpty() ? Array.Empty() : s.RoleIds.Select(x => new Sys_Role { Id = x })); + d => d.Roles + , s => s.RoleIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.RoleIds, x => new Sys_Role { Id = x })); _ = config.ForType() .Map( // d => d.Password, s => s.PasswordText.NullOrEmpty() ? Guid.Empty : s.PasswordText.Pwd().Guid()) .Map( // - d => d.Roles, s => s.RoleIds.NullOrEmpty() ? Array.Empty() : s.RoleIds.Select(x => new Sys_Role { Id = x })); + d => d.Roles + , s => s.RoleIds.NullOrEmpty() ? Array.Empty() : Enumerable.Select(s.RoleIds, x => new Sys_Role { Id = x })); + + // ReSharper restore InvokeAsExtensionMethod + #pragma warning restore RCS1196 } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs similarity index 98% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs index 417ba5b3..ff9b7969 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserProfile.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserProfile.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 用户档案表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs index c251ae87..e0b260e8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_UserRole.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_UserRole.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 用户-角色映射表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs rename to src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs index f311303e..b25388e5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/DbMaps/Sys/Sys_VerifyCode.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/DbMaps/Sys/Sys_VerifyCode.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.DbMaps.Sys; /// /// 验证码表 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs similarity index 58% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs index 29383823..7c600097 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/CreateApiReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/CreateApiReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Api; /// /// 请求：创建接口 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs index 7ea6ebd1..23f45161 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/ExportApiRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/ExportApiRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; +namespace NetAdmin.Domain.Dto.Sys.Api; /// /// 响应：导出接口 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs similarity index 58% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs index 6d411819..fb0e1310 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Api; /// /// 请求：查询接口 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs index 88db6709..52b8a965 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Api/QueryApiRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Api/QueryApiRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Api; /// /// 响应：查询接口 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs index 12640e93..f7b0eb37 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/CacheStatisticsRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +namespace NetAdmin.Domain.Dto.Sys.Cache; /// /// 响应：缓存统计 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs index e6e9bdef..106b86a8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/DelEntryReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/DelEntryReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +namespace NetAdmin.Domain.Dto.Sys.Cache; /// /// 请求：删除缓存项 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs similarity index 80% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs index e3ec64d7..98d4e2a5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetAllEntriesReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +namespace NetAdmin.Domain.Dto.Sys.Cache; /// /// 请求：获取所有缓存项 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs similarity index 79% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs index d86b4334..47b986e3 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntriesReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntriesReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +namespace NetAdmin.Domain.Dto.Sys.Cache; /// /// 请求：获取缓存项 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs index bf6fa9e8..08de42d9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Cache/GetEntryRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Cache/GetEntryRsp.cs @@ -1,6 +1,6 @@ using StackExchange.Redis; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +namespace NetAdmin.Domain.Dto.Sys.Cache; /// /// 响应：获取所有缓存项 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs index 962cab00..2472c75e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/GetCaptchaRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +namespace NetAdmin.Domain.Dto.Sys.Captcha; /// /// 响应：获取人机校验图 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs index 7e47100d..cf6f079e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Captcha/VerifyCaptchaReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +namespace NetAdmin.Domain.Dto.Sys.Captcha; /// /// 请求：完成人机验证 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs index fc5467ea..4496e15e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/CreateConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/CreateConfigReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 请求：创建配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs similarity index 83% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs index 8aeed6f9..4d482470 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/EditConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/EditConfigReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 请求：编辑配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs index bc6d75c6..02a3e100 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/ExportConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/ExportConfigRsp.cs @@ -1,7 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 响应：导出配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs index bbde4e52..53f0a5f0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 请求：查询配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs index e2ef1416..0dbdda5f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/QueryConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/QueryConfigRsp.cs @@ -1,7 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 响应：查询配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs index 88660fcd..586e0662 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Config/SetConfigEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Config; /// /// 请求：启用/禁用配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs index 1e37c2a0..ee7033a8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/CreateDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/CreateDeptReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 请求：创建部门 @@ -22,7 +22,7 @@ public record CreateDeptReq : Sys_Dept /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; + public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs index df4b915b..664e41e1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/EditDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/EditDeptReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 请求：编辑部门 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs similarity index 95% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs index f45824e6..3a2424c2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/ExportDeptRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/ExportDeptRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 响应：导出部门 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs index a0c38716..e55b4065 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 请求：查询部门 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs index ccf1f43f..e112ba2f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/QueryDeptRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/QueryDeptRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 响应：查询部门 @@ -32,7 +32,7 @@ public record QueryDeptRsp : Sys_Dept /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; + public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs index 2078f026..ccf161b0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dept/SetDeptEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dept; /// /// 请求：启用/禁用部门 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs index 6e95b548..9b13f724 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateCsCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +namespace NetAdmin.Domain.Dto.Sys.Dev; /// /// 请求：生成后端代码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs index e2ac4ab0..6d4cd475 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/GenerateIconCodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +namespace NetAdmin.Domain.Dto.Sys.Dev; /// /// 请求：生成图标代码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs index a47b35da..870ed501 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dev/IconExportJsInfo.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dev/IconExportJsInfo.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +namespace NetAdmin.Domain.Dto.Sys.Dev; /// /// IconExportJsInfo diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs index 13913a8f..08da6f19 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/CreateDicCatalogReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：创建字典目录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs similarity index 82% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs index 67615fbf..8fb81ea0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/EditDicCatalogReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：编辑字典目录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs similarity index 60% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs index d7abee76..7109e016 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// /// 请求：查询字典目录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs index 724f42aa..c9ac5cb1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Catalog/QueryDicCatalogRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Catalog; /// /// 响应：查询字典目录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs index 3852119b..a1d4bb3b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/CreateDicContentReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 请求：创建字典内容 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs similarity index 82% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs index bb8b8443..59ff032a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/EditDicContentReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 请求：编辑字典内容 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs index 3a32f31b..4edf2f59 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/ExportDicContentRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 响应：导出字典内容 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs index ce05dc5d..6be897c4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/GetDicValueReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 请求：获取字典值 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs similarity index 60% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs index 04de6f72..542721db 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 请求：查询字典内容 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs index 29909c48..6be53609 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/QueryDicContentRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 响应：查询字典内容 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs index ab4246a7..2e00ccbe 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Dic/Content/SetDicContentEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Dic.Content; /// /// 请求：设置字典内容启用状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs similarity index 86% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs index 83e89d5a..7ebd3522 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetBarChartRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetBarChartRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys; +namespace NetAdmin.Domain.Dto.Sys; /// /// 响应：获取条形图数据 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs similarity index 86% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs index 7477d981..85473b85 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/GetPieChartRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/GetPieChartRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys; +namespace NetAdmin.Domain.Dto.Sys; /// /// 响应：获取饼图数据 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs index a481716c..54c2df2f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/CreateJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/CreateJobReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Attributes.DataValidation; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 请求：创建计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs similarity index 83% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs index e6526af0..2a5f49f1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/EditJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/EditJobReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 请求：编辑计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs index a8818930..dd92ee8e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/ExportJobRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/ExportJobRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 响应：导出计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs similarity index 81% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs index b894fe2e..21ba8801 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/FinishJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/FinishJobReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 请求：完成计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs index ccabc317..d3869bf9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 请求：查询计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs index 2c3b0464..22e46348 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/QueryJobRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/QueryJobRsp.cs @@ -1,8 +1,10 @@ using CronExpressionDescriptor; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Enums.Sys; using Options = CronExpressionDescriptor.Options; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 响应：查询计划作业 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs index b01e3f5c..5099cc17 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Job/SetJobEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Job/SetJobEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Job; /// /// 请求：设置计划作业启用状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs similarity index 62% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs index 064b1e71..60afea1f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/CreateJobRecordReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// /// 请求：创建计划作业执行记录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs index 63bd4193..7624099d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/ExportJobRecordRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Job; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// /// 响应：导出计划作业执行记录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs index 96eabd6a..031c62e9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// /// 请求：查询计划作业执行记录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs similarity index 95% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs index 2564386b..2919356f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/JobRecord/QueryJobRecordRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Job; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +namespace NetAdmin.Domain.Dto.Sys.JobRecord; /// /// 响应：查询计划作业执行记录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs index 4c6ce4a6..9587df5d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/CreateLoginLogReq.cs @@ -1,9 +1,9 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.Domain.Dto; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.Domain.Dto.Sys.LoginLog; /// /// 请求：创建登录日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs index 39643ec2..639ec1a5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/ExportLoginLogRsp.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.Domain.Dto.Sys.LoginLog; /// /// 响应：导出登录日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs index c1771cc5..53d00182 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.LoginLog; /// /// 请求：查询登录日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs index a1e6c803..e8725e9f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/LoginLog/QueryLoginLogRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +namespace NetAdmin.Domain.Dto.Sys.LoginLog; /// /// 响应：查询登录日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs index 6709bea7..fd6bb29a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/CreateMenuReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/CreateMenuReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +namespace NetAdmin.Domain.Dto.Sys.Menu; /// /// 请求：创建菜单 @@ -54,7 +55,7 @@ public record CreateMenuReq : Sys_Menu /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; + public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// public override string Tag => Meta.Tag; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs index d745504c..ef1aed9b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/EditMenuReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/EditMenuReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +namespace NetAdmin.Domain.Dto.Sys.Menu; /// /// 请求：更新菜单 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs index db0c4ac3..62407cbb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/MetaInfo.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/MetaInfo.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Menu; /// /// 信息：元数据 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs index b9485e5f..67b10329 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Menu; /// /// 请求：查询菜单 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs index 0dfd238e..8c61d6ab 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Menu/QueryMenuRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Menu/QueryMenuRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Menu; /// /// 信息：菜单 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs similarity index 65% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs index 04d6c52d..252285f7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/CreateRequestLogReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.Domain.Dto.Sys.RequestLog; /// /// 请求：创建请求日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs index 31542243..50ef6e16 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/ExportRequestLogRsp.cs @@ -1,8 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.Domain.Dto.Sys.RequestLog; /// /// 响应：导出请求日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs similarity index 78% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs index 3d051737..c6937605 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.RequestLog; /// /// 请求：查询请求日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs index 9dc3aa8c..bd2e893a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLog/QueryRequestLogRsp.cs @@ -1,8 +1,9 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +namespace NetAdmin.Domain.Dto.Sys.RequestLog; /// /// 响应：查询请求日志 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs similarity index 62% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs index 003ca697..30330c1a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/CreateRequestLogDetailReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; /// /// 请求：创建请求日志明细 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs index d60643e7..0b5981b0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; /// /// 请求：查询请求日志明细 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs similarity index 95% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs index 0ff35620..79e8634b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/RequestLogDetail/QueryRequestLogDetailRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +namespace NetAdmin.Domain.Dto.Sys.RequestLogDetail; /// /// 响应：查询请求日志明细 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs index e2b164fc..d124170b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/CreateRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/CreateRoleReq.cs @@ -1,7 +1,7 @@ -using NetAdmin.SysComponent.Domain.Attributes.DataValidation; -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：创建角色 @@ -52,7 +52,7 @@ public record CreateRoleReq : Sys_Role, IValidatableObject /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; + public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs index 86c97c75..b0b1a37c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/EditRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/EditRoleReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：编辑角色 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs index dd2813c3..da2f5038 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/ExportRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/ExportRoleRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 响应：导出角色 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs index 995da42e..64c8153f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/GetMenusRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/GetMenusRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 响应： 获取角色菜单 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs index 2f437c09..8d320234 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/MapMenusReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/MapMenusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：角色-菜单映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs index e4aba47f..502ea0c1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：查询角色 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs similarity index 82% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs index 445fd027..ef796c96 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/QueryRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/QueryRoleRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 响应：查询角色 @@ -59,7 +60,7 @@ public record QueryRoleRsp : Sys_Role /// [JsonIgnore(Condition = JsonIgnoreCondition.Never)] - public override long Sort { get; init; } = SysNumbers.DEF_SORT_VAL; + public override long Sort { get; init; } = Numbers.DEF_SORT_VAL; /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] @@ -72,15 +73,21 @@ public record QueryRoleRsp : Sys_Role /// public override void Register(TypeAdapterConfig config) { + #pragma warning disable RCS1196 + + // ReSharper disable InvokeAsExtensionMethod _ = config.ForType() // .IgnoreIf((s, _) => s.Depts == null, d => d.DeptIds) .IgnoreIf((s, _) => s.Menus == null, d => d.MenuIds) .IgnoreIf((s, _) => s.Apis == null, d => d.ApiIds) - .Map(d => d.DeptIds, s => s.Depts.Select(x => x.Id)) - .Map(d => d.ApiIds, s => s.Apis.Select(x => x.Id)) - .Map(d => d.MenuIds, s => s.Menus.Select(x => x.Id)) + .Map(d => d.DeptIds, s => Enumerable.Select(s.Depts, x => x.Id)) + .Map(d => d.ApiIds, s => Enumerable.Select(s.Apis, x => x.Id)) + .Map(d => d.MenuIds, s => Enumerable.Select(s.Menus, x => x.Id)) // ; + + // ReSharper restore InvokeAsExtensionMethod + #pragma warning restore RCS1196 } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs index b75a3201..90e45a05 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetDisplayDashboardReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：设置是否显示仪表板 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs index 13906b84..820404d2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetIgnorePermissionControlReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：设置是否忽略权限控制 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs index b18a7a1a..17cd6efb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Role/SetRoleEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.Role; /// /// 请求：启用/禁用角色 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs index 827bbe48..721e4720 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/CreateSiteMsgReq.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsg; /// /// 请求：创建站内信 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs similarity index 87% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs index af10106c..88d0b74e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/ExportSiteMsgRsp.cs @@ -1,8 +1,9 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.Domain.Dto.Sys.SiteMsg; /// /// 响应：导出站内信 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs index f35b5b52..3a61f59d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsg; /// /// 请求：查询站内信 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs index a12f50d6..5a621c65 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsg/QuerySiteMsgRsp.cs @@ -1,9 +1,11 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +namespace NetAdmin.Domain.Dto.Sys.SiteMsg; /// /// 响应：查询站内信 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs similarity index 62% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs index 87dfb17d..b995a7ce 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/CreateSiteMsgDeptReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// /// 请求：创建站内信-部门映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs index c1282420..4270d326 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// /// 请求：查询站内信-部门映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs index 1401811e..dd42ed09 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgDept/QuerySiteMsgDeptRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgDept; /// /// 响应：查询站内信-部门映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs index 67ff6463..6f08b6d4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/CreateSiteMsgFlagReq.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：创建站内信标记 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs similarity index 71% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs index b147e38d..b499a418 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/EditSiteMsgReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsg; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：编辑站内信 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs index 2904c280..78966bdf 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：查询站内信标记 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs similarity index 78% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs index 4f49404f..8c38a796 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/QuerySiteMsgFlagRsp.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// /// 响应：查询站内信标记 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs similarity index 70% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs index c6d6e823..c5e8aab8 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgFlag/SetUserSiteMsgStatusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +namespace NetAdmin.Domain.Dto.Sys.SiteMsgFlag; /// /// 请求：设置用户站内信状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs similarity index 62% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs index 25c2fe30..f96fcae0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/CreateSiteMsgRoleReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// /// 请求：创建站内信-角色映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs index 45e4d677..0589ce68 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// /// 请求：查询站内信-角色映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs index 96a384ae..e2f0a71a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgRole/QuerySiteMsgRoleRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgRole; /// /// 响应：查询站内信-角色映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs similarity index 62% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs index ee2b2a98..d5b2e52d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/CreateSiteMsgUserReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// /// 请求：创建站内信-用户映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs index 32d96c95..a16efd15 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// /// 请求：查询站内信-用户映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs similarity index 77% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs index 7ed61962..08591bac 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/SiteMsgUser/QuerySiteMsgUserRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.SiteMsgUser; /// /// 响应：查询站内信-用户映射 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs similarity index 79% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs index 331993e8..cb9dffeb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/AesDecodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/AesDecodeReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +namespace NetAdmin.Domain.Dto.Sys.Tool; /// /// 请求：Aes解密 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs index f310ebc5..a56c86b5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/ExecuteSqlReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +namespace NetAdmin.Domain.Dto.Sys.Tool; /// /// 请求：执行SQL diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs similarity index 86% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs index 54b462ca..094e751b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/Tool/GetModulesRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/Tool/GetModulesRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +namespace NetAdmin.Domain.Dto.Sys.Tool; /// /// 响应：获取模块信息 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs index 123c9136..b7b21799 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckMobileAvailableReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：检查手机号码是否可用 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs index 619fc5d7..e6129e0a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CheckUserNameAvailableReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：检查用户名是否可用 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs similarity index 96% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs index fcaa66f3..1e11dc1f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateEditUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateEditUserReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：创建编辑用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs index 9781cd6c..6e571563 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/CreateUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/CreateUserReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：创建用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs similarity index 81% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs index 325eddaa..c889464c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/EditUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/EditUserReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.UserProfile; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：编辑用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs similarity index 79% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs index 34b263f5..2ec935f1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ExportUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ExportUserRsp.cs @@ -1,7 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 响应：导出用户 @@ -76,7 +77,11 @@ public sealed record ExportUserRsp : QueryUserRsp public override void Register(TypeAdapterConfig config) { _ = config.ForType() - .Map(d => d.DeptName, s => s.Dept.Name) - .Map(d => d.RoleNames, s => string.Join(',', s.Roles.Select(x => x.Name))); + .Map(d => d.DeptName, s => s.Dept.Name) + #pragma warning disable RCS1196 + + // ReSharper disable once InvokeAsExtensionMethod + .Map(d => d.RoleNames, s => string.Join(',', Enumerable.Select(s.Roles, x => x.Name))); + #pragma warning restore RCS1196 } } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs index 822b259a..e4980e9a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginByPwdReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginByPwdReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：密码登录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs similarity index 51% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs index a00ccc5d..66d04aea 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginBySmsReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginBySmsReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：短信登录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs index e64566f5..81f99b75 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/LoginRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/LoginRsp.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 响应：密码登录 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs similarity index 87% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs index f9b83cc6..dec07aad 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：查询用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs similarity index 93% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs index a5c9d15b..b2d8129e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/QueryUserRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/QueryUserRsp.cs @@ -1,7 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 响应：查询用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs index afdee157..ee250e12 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/RegisterUserReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/RegisterUserReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：注册用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs index c2c22686..c8fa6425 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/ResetPasswordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/ResetPasswordReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：重置密码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs index 7bdb6cff..8b71e7be 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetAvatarReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetAvatarReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：设置用户头像 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs similarity index 69% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs index f4caef17..c63c8125 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetEmailReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetEmailReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：设置邮箱 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs similarity index 82% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs index 4cea3e0a..8e42a120 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetMobileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetMobileReq.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：设置手机号 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs similarity index 91% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs index 9a92a9ea..275fc461 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetPasswordReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetPasswordReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：设置密码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs index db0c2eda..d5e3de49 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/SetUserEnabledReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/SetUserEnabledReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 请求：启用/禁用用户 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs similarity index 81% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs index 94a955c8..c2a0a200 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/User/UserInfoRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/User/UserInfoRsp.cs @@ -1,7 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Role; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.User; +namespace NetAdmin.Domain.Dto.Sys.User; /// /// 响应：当前用户信息 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs index 580a39b4..769586aa 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/CreateUserProfileReq.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dic.Content; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 请求：创建用户档案 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs similarity index 85% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs index 68a8be81..62606dd4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/EditUserProfileReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 请求：编辑用户档案 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs index 961808e9..db987b0a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/GetSessionUserAppConfigRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 响应：获取当前用户应用配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs similarity index 76% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs index 07ae5c68..6850ec7f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 请求：查询用户档案 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs similarity index 97% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs index 701ef790..bb86f4f5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/QueryUserProfileRsp.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dic.Content; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 响应：查询用户档案 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs similarity index 80% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs index cf97f047..cccd2fa2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/UserProfile/SetSessionUserAppConfigReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.UserProfile; /// /// 请求：设置当前用户应用配置 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs similarity index 58% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs index c13a50c9..edad0698 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/CreateVerifyCodeReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：创建验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs similarity index 76% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs index 8d625d56..2c83eeba 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：查询验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs similarity index 84% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs index 7ae35741..b8f306d6 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/QueryVerifyCodeRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 响应：查询验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs index 3f11a7c7..54f82473 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeReq.cs @@ -1,6 +1,8 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Enums.Sys; -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：发送验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs similarity index 79% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs index 4c33af26..b4e248d7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SendVerifyCodeRsp.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 响应：发送验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs similarity index 83% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs index 7d00ac33..3c2012b5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/SetVerifyCodeStatusReq.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：设置验证码状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs index b478868f..7b53130d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyCodeReq.cs @@ -1,4 +1,6 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs similarity index 78% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs index 44459459..9a825e29 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifyEmailCodeReq.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实邮箱验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs similarity index 78% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs index 1ab17813..f22ca70e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Dto/Sys/VerifyCode/VerifySmsCodeReq.cs @@ -1,4 +1,7 @@ -namespace NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Enums.Sys; + +namespace NetAdmin.Domain.Dto.Sys.VerifyCode; /// /// 请求：核实短信验证码 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/DataScopes.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/DataScopes.cs index d53ff19f..4f5c9d98 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/DataScopes.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/DataScopes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 角色数据范围 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs index 9019e1e6..584d9174 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/JobStatues.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/JobStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 计划作业状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/MenuTypes.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/MenuTypes.cs index 2e70c60e..70f22274 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/MenuTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/MenuTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 菜单类型 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs similarity index 87% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs index 6e970372..24d7fbc1 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/SiteMsgTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/SiteMsgTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 站内信类型 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs similarity index 90% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs index 498e4a97..839f23f7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/UserSiteMsgStatues.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/UserSiteMsgStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 站内信状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs similarity index 88% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs index 8b6bb799..8c4dd2ca 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeDeviceTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 验证码目标设备类型 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs similarity index 92% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs index b6d8d190..c22dba26 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeStatues.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeStatues.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 验证码状态 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs similarity index 94% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs index 83786c1c..90b8195b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Enums/Sys/VerifyCodeTypes.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Enums/Sys/VerifyCodeTypes.cs @@ -1,4 +1,4 @@ -namespace NetAdmin.SysComponent.Domain.Enums.Sys; +namespace NetAdmin.Domain.Enums.Sys; /// /// 验证码类型 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs index b73ef9eb..18a4d529 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/RequestLogEvent.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/RequestLogEvent.cs @@ -1,7 +1,6 @@ -using NetAdmin.Domain.Events; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys.RequestLog; -namespace NetAdmin.SysComponent.Domain.Events.Sys; +namespace NetAdmin.Domain.Events.Sys; /// /// 请求日志事件 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs index a9e734a4..66804576 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserCreatedEvent.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserCreatedEvent.cs @@ -1,7 +1,6 @@ -using NetAdmin.Domain.Events; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Events.Sys; +namespace NetAdmin.Domain.Events.Sys; /// /// 用户被创建事件 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs index 1b5ba5a6..6294cd2a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/UserUpdatedEvent.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/UserUpdatedEvent.cs @@ -1,7 +1,6 @@ -using NetAdmin.Domain.Events; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; -namespace NetAdmin.SysComponent.Domain.Events.Sys; +namespace NetAdmin.Domain.Events.Sys; /// /// 用户被更新事件 diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs similarity index 89% rename from src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs rename to src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs index 3f73b768..566ee99d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/Events/Sys/VerifyCodeCreatedEvent.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/Events/Sys/VerifyCodeCreatedEvent.cs @@ -1,7 +1,6 @@ -using NetAdmin.Domain.Events; -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; -namespace NetAdmin.SysComponent.Domain.Events.Sys; +namespace NetAdmin.Domain.Events.Sys; /// /// 验证码创建事件 diff --git a/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj index 681c72f9..682cdcaf 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj +++ b/src/backend/NetAdmin/NetAdmin.Domain/NetAdmin.Domain.csproj @@ -9,4 +9,7 @@ + + + \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs b/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs index 4f775145..d0dc9fa3 100644 --- a/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs +++ b/src/backend/NetAdmin/NetAdmin.Domain/ProjectUsings.cs @@ -1,5 +1,12 @@ +global using NetAdmin.Domain; global using NetAdmin.Domain.Attributes; +global using NetAdmin.Domain.Attributes.DataValidation; global using NetAdmin.Domain.DbMaps.Dependency; global using NetAdmin.Domain.DbMaps.Dependency.Fields; +global using NetAdmin.Domain.Dto.Dependency; global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; -global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; \ No newline at end of file +global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; +global using CsvName = CsvHelper.Configuration.Attributes.NameAttribute; +global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; +global using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; +global using SqlIndex = FreeSql.DataAnnotations.IndexAttribute; \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs index 5d660e8e..98f6e559 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Chars.cs @@ -75,6 +75,7 @@ public static class Chars public const string FLG_HTTP_METHOD_TRACE = "TRACE"; public const string FLG_PATH_API_METRICS = "metrics"; public const string FLG_PATH_API_RPOBE = "api/probe"; + public const string FLG_PATH_API_SYS_USER_LOGIN_BY_PWD = "api/sys/user/login.by.pwd"; public const string FLG_PATH_WEBSOCKET_PREFIX = "ws"; public const string FLG_REDIS_INSTANCE_DATA_CACHE = "DataCache"; public const string FLG_SNOWFLAKE_WORK_ID = "SNOWFLAKE_WORK_ID"; diff --git a/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Numbers.cs b/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Numbers.cs index b2360c87..9c1e6f37 100644 --- a/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Numbers.cs +++ b/src/backend/NetAdmin/NetAdmin.Infrastructure/Constant/Numbers.cs @@ -10,14 +10,23 @@ namespace NetAdmin.Infrastructure.Constant; /// public static class Numbers { - public const int DEF_PAGE_SIZE_QUERY = 20; // 默认值：分页查询页容量 - public const int HTTP_STATUS_BIZ_FAIL = 900; // HTTP状态码：业务异常 - public const int MAX_LIMIT_BULK_REQ = 100; // 最大限制：批量请求数 - public const int MAX_LIMIT_EXPORT = 50000; // 最大限制：导出为CSV文件的条数 - public const int MAX_LIMIT_QUERY = 1000; // 最大限制：非分页查询条数 - public const int MAX_LIMIT_QUERY_PAGE_NO = 10000; // 最大限制：分页查询页码 - public const int MAX_LIMIT_QUERY_PAGE_SIZE = 100; // 最大限制：分页查询页容量 - public const int MAX_LIMIT_RETRY_CNT_REDIS_LOCK = 10; // 最大限制：Redis锁重试次数 - public const int SECS_REDIS_LOCK_EXPIRY = 60; // 秒：Redis锁过期时间 - public const int SECS_REDIS_LOCK_RETRY_DELAY = 1; // 秒：Redis锁重试间隔 + public const int DEF_PAGE_SIZE_QUERY = 20; // 默认值：分页查询页容量 + public const long DEF_SORT_VAL = 100; // 默认值：排序字段 + public const int HTTP_STATUS_BIZ_FAIL = 900; // HTTP状态码：业务异常 + public const long ID_DIC_CATALOG_GEO_AREA = 379794295185413; // 唯一编号：字典目录-行政区划字典 + public const int MAX_LIMIT_BULK_REQ = 100; // 最大限制：批量请求数 + public const int MAX_LIMIT_EXPORT = 50000; // 最大限制：导出为CSV文件的条数 + public const int MAX_LIMIT_QUERY = 1000; // 最大限制：非分页查询条数 + public const int MAX_LIMIT_QUERY_PAGE_NO = 10000; // 最大限制：分页查询页码 + public const int MAX_LIMIT_QUERY_PAGE_SIZE = 100; // 最大限制：分页查询页容量 + public const int MAX_LIMIT_RETRY_CNT_REDIS_LOCK = 10; // 最大限制：Redis锁重试次数 + public const int REQUEST_LOG_BUFF_SIZE = 1000; // 请求日志缓冲区大小 + public const int SCHEDULED_JOB_PARALLEL_NUM = 5; // 计划作业并发数 + public const int SECS_CACHE_CHART = 300; // 缓存时间（秒）：仪表 + public const int SECS_CACHE_DEFAULT = 60; // 缓存时间（秒）：默认 + public const int SECS_CACHE_DIC_CATALOG_CODE = 300; // 缓存时间（秒）：字典配置-目录代码 + public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 缓存时间（秒）：通过用户编号登录的用户信息 + public const int SECS_REDIS_LOCK_EXPIRY = 60; // 秒：Redis锁过期时间 + public const int SECS_REDIS_LOCK_RETRY_DELAY = 1; // 秒：Redis锁重试间隔 + public const int SECS_TIMEOUT_JOB = 180; // 超时时间（秒）：作业 } \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs index ec4df342..72b8d6ba 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IApiModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs index e8e755a5..fa6b6951 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICacheModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +using NetAdmin.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs index 3e15a386..a37af239 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ICaptchaModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs index 6614f1de..5b902427 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IConfigModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs index d34043d3..9e2725af 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDeptModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs index d8db9483..cb3c2092 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDevModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +using NetAdmin.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs index 679eb82d..2830c1b7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicCatalogModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs index c995fa24..2acdc846 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicContentModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs index 4f57971f..42252a8c 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IDicModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs index 1da32e29..48c54559 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobModule.cs @@ -1,5 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs index 91080612..3d37a3fa 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IJobRecordModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs index 00f977cc..ec9d28d0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ILoginLogModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs index 5e41c58b..2c069f7e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IMenuModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs index 6a7fe99f..11238892 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogDetailModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs index 9691eb7f..23b4701b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRequestLogModule.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs index 0b1f3284..6b05ed4e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IRoleModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs index 1487bc98..69be14a9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgDeptModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs index 738b1a1e..18ab3c25 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgFlagModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs index 7c80c27a..78a73738 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs index c2093f69..88e81005 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgRoleModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs index f7ac0d6c..55c2ae91 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/ISiteMsgUserModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs index 912a4ff2..d0bbe7ac 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IToolsModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +using NetAdmin.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs index be2c28fb..24127e05 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserModule.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs index 59964736..f5939a85 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IUserProfileModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs index 7c53f851..7cd4e075 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/IVerifyCodeModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs index 8527320b..16a7a99e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Modules/Sys/Session/IUserModule.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.UserProfile; // ReSharper disable once CheckNamespace namespace NetAdmin.SysComponent.Application.Modules.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj index b2e71582..6138b0be 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/ProjectUsings.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/ProjectUsings.cs index 62d5b2cf..c520b787 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/ProjectUsings.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/ProjectUsings.cs @@ -4,8 +4,5 @@ global using NetAdmin.Application.Services; global using NetAdmin.Domain.Dto.Dependency; global using NetAdmin.SysComponent.Application.Modules.Sys; global using NetAdmin.SysComponent.Application.Services.Sys.Dependency; -global using NetAdmin.SysComponent.Domain.DbMaps.Sys; -global using NetAdmin.SysComponent.Domain.Dto.Sys; -global using NetAdmin.SysComponent.Domain.Enums.Sys; global using DynamicFilterInfo = NetAdmin.Domain.Dto.DynamicFilterInfo; global using DynamicFilterOperators = NetAdmin.Domain.Enums.DynamicFilterOperators; \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs index b58990cb..25155827 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ApiService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs index 9c3c39f5..27f65598 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CacheService.cs @@ -1,5 +1,5 @@ using System.Collections.Concurrent; -using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +using NetAdmin.Domain.Dto.Sys.Cache; using StackExchange.Redis; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs index 1a6600e3..dbb3963a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/CaptchaService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; using SixLabors.ImageSharp; using Yitter.IdGenerator; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs index bd62e7f5..32042cb4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ConfigService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs index acac3f75..cd319bdb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IApiService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs index 440153ea..885c369a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicCatalogService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs index e49ddb34..38483235 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IDicContentService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs index 02beb84e..b192498b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobRecordService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs index e3f65f13..2824b894 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IJobService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.Job; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs index dfc8c481..dfe64064 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/ISiteMsgFlagService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs index 6de23d56..2912d2bb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserProfileService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs index e77b7219..41589204 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IUserService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs index 9026d4c2..24c18878 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/Dependency/IVerifyCodeService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Application.Services.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs index 8f060689..a385056e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DeptService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs index 656c5bdd..019acb90 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DevService.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +using NetAdmin.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -11,7 +11,10 @@ public sealed class DevService(IApiService apiService) : ServiceBase private static readonly string _clientProjectPath = Path.Combine( // Environment.CurrentDirectory, "../../frontend/admin"); - private static readonly string[] _projectDirs = Directory.GetDirectories(Path.Combine(Environment.CurrentDirectory, "../")); + private static readonly string[] _projectDirs = Directory.GetDirectories(Path.Combine(Environment.CurrentDirectory, "../")) + .Concat(Directory.GetDirectories( + Path.Combine(Environment.CurrentDirectory, "../NetAdmin"))) + .ToArray(); private static readonly Regex _regex = new(@"\.(\w)"); private static readonly Regex _regex2 = new("([a-zA-Z]+):"); diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs index 2f716091..61312e0e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicCatalogService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs index 3c2f260c..e06d26bc 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicContentService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs index e309cb9b..ac6e6c71 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/DicService.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs index e645bd13..e6c91f0d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobRecordService.cs @@ -1,4 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs index 2fd2ab70..b1f8b4ad 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs @@ -1,8 +1,10 @@ using Cronos; using FreeSql.Internal; -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -298,13 +300,13 @@ public sealed class JobService(BasicRepository rpo, IJobRecordSer { var ret1 = await UpdateAsync( // 运行中，运行时间超过超时设定；置为空闲状态 new Sys_Job { Status = JobStatues.Idle }, [nameof(Sys_Job.Status)], null - , a => a.Status == JobStatues.Running && a.LastExecTime < DateTime.Now.AddSeconds(-SysNumbers.SECS_TIMEOUT_JOB), null, true) + , a => a.Status == JobStatues.Running && a.LastExecTime < DateTime.Now.AddSeconds(-Numbers.SECS_TIMEOUT_JOB), null, true) .ConfigureAwait(false); var ret2 = await UpdateAsync( // 空闲中，下次执行时间在当前时间减去超时时间以前；将下次执行时间调整到现在 new Sys_Job { NextExecTime = DateTime.Now, NextTimeId = DateTime.Now.TimeUnixUtc() } - , [nameof(Sys_Job.NextExecTime), nameof(Sys_Job.NextTimeId)], null - , a => a.Status == JobStatues.Idle && a.NextExecTime < DateTime.Now.AddSeconds(-SysNumbers.SECS_TIMEOUT_JOB), null, true) + , [nameof(Sys_Job.NextExecTime), nameof(Sys_Job.NextTimeId)], null + , a => a.Status == JobStatues.Idle && a.NextExecTime < DateTime.Now.AddSeconds(-Numbers.SECS_TIMEOUT_JOB), null, true) .ConfigureAwait(false); return ret1 + ret2; } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs index f458629c..7f0b9da5 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/LoginLogService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs index 37d4374f..60d727c9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/MenuService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs index 9e88cca9..ccb36212 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogDetailService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs index 24262602..ca049f91 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RequestLogService.cs @@ -1,6 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -40,7 +41,7 @@ public sealed class RequestLogService(BasicRepository rpo, var ret = await Rpo.InsertAsync(req).ConfigureAwait(false); // 插入登录日志 - if (req.ApiPathCrc32 == SysChars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD.Crc32()) { + if (req.ApiPathCrc32 == Chars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD.Crc32()) { _ = await loginLogService.CreateAsync(req.Adapt()).ConfigureAwait(false); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs index d6563917..c2fd630e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/RoleService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -152,15 +153,21 @@ public sealed class RoleService(BasicRepository rpo) // private ISelect QueryInternal(QueryReq req) { - var ret = Rpo.Select.IncludeMany(a => a.Depts.Select(b => new Sys_Dept { Id = b.Id })) - .IncludeMany(a => a.Menus.Select(b => new Sys_Menu { Id = b.Id })) - .IncludeMany(a => a.Apis.Select(b => new Sys_Api { Id = b.Id })) + #pragma warning disable RCS1196 + + // ReSharper disable InvokeAsExtensionMethod + var ret = Rpo.Select.IncludeMany(a => Enumerable.Select(a.Depts, b => new Sys_Dept { Id = b.Id })) + .IncludeMany(a => Enumerable.Select(a.Menus, b => new Sys_Menu { Id = b.Id })) + .IncludeMany(a => Enumerable.Select(a.Apis, b => new Sys_Api { Id = b.Id })) .WhereDynamicFilter(req.DynamicFilter) .WhereDynamic(req.Filter) .WhereIf( // req.Keywords?.Length > 0 , a => a.Id == req.Keywords.Int64Try(0) || a.Name.Contains(req.Keywords) || a.Summary.Contains(req.Keywords)); + // ReSharper restore InvokeAsExtensionMethod + #pragma warning restore RCS1196 + // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault switch (req.Order) { case Orders.None: diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs index 65af6c2a..6fb3f6c6 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgDeptService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs index a6507275..db02ece4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgFlagService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs index f672119d..0ad07d14 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgRoleService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs index 58a1a450..a6e6e67f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgService.cs @@ -1,7 +1,9 @@ -using NetAdmin.SysComponent.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Contexts; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Enums.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs index e93dea4f..d9eafa3f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/SiteMsgUserService.cs @@ -1,4 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs index 0a8f4ade..67a117f7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/ToolsService.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +using NetAdmin.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Application.Services.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs index 9c05d218..30ef5ad7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserProfileService.cs @@ -1,7 +1,7 @@ -using NetAdmin.SysComponent.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.Contexts; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -179,11 +179,10 @@ public sealed class UserProfileService(BasicRepository rp { #pragma warning disable CA1305,IDE0072 var ret = Rpo.Orm.Select() - .LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin((a, _, c, __, ___) => a.CompanyArea.ToString() == c.Value && c.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin((a, _, __, d, ___) => a.HomeArea.ToString() == d.Value && d.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) - .LeftJoin( - (a, _, __, ___, e) => a.EmergencyContactArea.ToString() == e.Value && e.CatalogId == SysNumbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, b, _, __, ___) => a.NationArea.ToString() == b.Value && b.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, _, c, __, ___) => a.CompanyArea.ToString() == c.Value && c.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, _, __, d, ___) => a.HomeArea.ToString() == d.Value && d.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) + .LeftJoin((a, _, __, ___, e) => a.EmergencyContactArea.ToString() == e.Value && e.CatalogId == Numbers.ID_DIC_CATALOG_GEO_AREA) .WhereDynamicFilter(req.DynamicFilter); return req.Order switch { diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs index 862ac215..9206aa5b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/UserService.cs @@ -1,9 +1,10 @@ using NetAdmin.Domain.Attributes.DataValidation; using NetAdmin.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -506,8 +507,12 @@ public sealed class UserService( private ISelect QueryInternal(QueryReq req, IEnumerable deptIds, bool includeRoles = true) { var ret = Rpo.Select.Include(a => a.Dept); + + #pragma warning disable RCS1196 + + // ReSharper disable InvokeAsExtensionMethod if (includeRoles) { - ret = ret.IncludeMany(a => a.Roles.Select(b => new Sys_Role { Id = b.Id, Name = b.Name })); + ret = ret.IncludeMany(a => Enumerable.Select(a.Roles, b => new Sys_Role { Id = b.Id, Name = b.Name })); } ret = ret.WhereDynamicFilter(req.DynamicFilter) @@ -515,12 +520,15 @@ public sealed class UserService( .WhereIf( // req.Filter?.Id > 0, a => a.Id == req.Filter.Id) .WhereIf( // - req.Filter?.RoleId > 0, a => a.Roles.Any(b => b.Id == req.Filter.RoleId)) + req.Filter?.RoleId > 0, a => Enumerable.Any(a.Roles, b => b.Id == req.Filter.RoleId)) .WhereIf( // req.Keywords?.Length > 0 , a => a.Id == req.Keywords.Int64Try(0) || a.UserName == req.Keywords || a.Mobile == req.Keywords || a.Email == req.Keywords || a.Summary.Contains(req.Keywords)); + // ReSharper restore InvokeAsExtensionMethod + #pragma warning restore RCS1196 + // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault switch (req.Order) { case Orders.None: diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs index 2eb9e803..ff46ec08 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/VerifyCodeService.cs @@ -1,5 +1,7 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Application.Services.Sys; @@ -120,6 +122,7 @@ public sealed class VerifyCodeService(BasicRepository rpo, QueryVerifyCodeRsp ret; #if !DEBUG + // 有发送记录，且小于1分钟，不允许 if (lastSent != null && (DateTime.Now - lastSent.CreatedTime).TotalMinutes < 1) { throw new NetAdminInvalidOperationException(Ln._1分钟内只能发送1次); diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/ProjectUsings.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/ProjectUsings.cs index fb6eb295..eadc3002 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/ProjectUsings.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/ProjectUsings.cs @@ -1,6 +1,6 @@ global using NetAdmin.Cache; global using NetAdmin.Domain.Dto.Dependency; +global using NetAdmin.Infrastructure.Constant; global using NetAdmin.SysComponent.Application.Modules.Sys; global using NetAdmin.SysComponent.Application.Services.Sys.Dependency; -global using NetAdmin.SysComponent.Cache.Sys.Dependency; -global using NetAdmin.SysComponent.Infrastructure.Constant; \ No newline at end of file +global using NetAdmin.SysComponent.Cache.Sys.Dependency; \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs index 49d404b0..104e049d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ApiCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs index bc8de36c..c0855e1d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CacheCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +using NetAdmin.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Cache.Sys; @@ -17,7 +17,7 @@ public sealed class CacheCache(IDistributedCache cache, ICacheService service) / { #if !DEBUG return GetOrCreateAsync( // - GetCacheKey(string.Empty), Service.CacheStatisticsAsync, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); + GetCacheKey(string.Empty), Service.CacheStatisticsAsync, TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); #else return Service.CacheStatisticsAsync(); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs index 0545b9d1..fba6c76f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/CaptchaCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Cache.Sys; @@ -10,8 +10,7 @@ public sealed class CaptchaCache(IDistributedCache cache, ICaptchaService servic public async Task GetCaptchaImageAsync() { var captchaRsp = await Service.GetCaptchaImageAsync().ConfigureAwait(false); - await CreateAsync(GetCacheKey(captchaRsp.Id, nameof(CaptchaCache)), captchaRsp.SawOffsetX -, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)) + await CreateAsync(GetCacheKey(captchaRsp.Id, nameof(CaptchaCache)), captchaRsp.SawOffsetX, TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)) .ConfigureAwait(false); return captchaRsp; } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs index 1a1a73c3..4018f606 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ConfigCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs index 64b129a1..98dbee46 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/ICaptchaCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs index e5bb917d..93f24a1d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IDicContentCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs index 95dae0e7..3657e651 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/Dependency/IUserCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.User; namespace NetAdmin.SysComponent.Cache.Sys.Dependency; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs index 207cff51..437a7671 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DeptCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DevCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DevCache.cs index 922f5d07..cf169b0b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DevCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DevCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +using NetAdmin.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCache.cs index 246d12a4..4f3c7f81 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys; @@ -79,7 +79,7 @@ public sealed class DicCache(IDistributedCache cache, IDicService service) // #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetDicValueAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); + , () => Service.GetDicValueAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); #else return Service.GetDicValueAsync(req); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs index 40c758b5..29a7e4be 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicCatalogCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs index ab143171..2d093489 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/DicContentCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Cache.Sys; @@ -65,8 +65,7 @@ public sealed class DicContentCache(IDistributedCache cache, IDicContentService { #if !DEBUG return GetOrCreateAsync( // - GetCacheKey(catalogCode), () => Service.QueryByCatalogCodeAsync(catalogCode) -, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DIC_CATALOG_CODE)); + GetCacheKey(catalogCode), () => Service.QueryByCatalogCodeAsync(catalogCode), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DIC_CATALOG_CODE)); #else return Service.QueryByCatalogCodeAsync(catalogCode); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobCache.cs index d514a5d8..fa84c1ce 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobCache.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Cache.Sys; @@ -85,7 +85,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordBarChartAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); + , () => Service.GetRecordBarChartAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); #else return Service.GetRecordBarChartAsync(req); #endif @@ -97,7 +97,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); + , () => Service.GetRecordPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); #else return Service.GetRecordPieChartByHttpStatusCodeAsync(req); #endif @@ -109,7 +109,7 @@ public sealed class JobCache(IDistributedCache cache, IJobService service) : Dis #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetRecordPieChartByNameAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); + , () => Service.GetRecordPieChartByNameAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); #else return Service.GetRecordPieChartByNameAsync(req); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs index 31cb8cec..579e6481 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/JobRecordCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs index a7c35f2a..e3687109 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/LoginLogCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs index e848e162..ce951afe 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/MenuCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs index f22e701c..272da9a4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Cache.Sys; @@ -16,14 +16,14 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService /// #if !DEBUG public async Task CountAsync(QueryReq req) - #else + #else public Task CountAsync(QueryReq req) #endif { #if !DEBUG var ret = await GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , async () => (long?)await Service.CountAsync(req).ConfigureAwait(false), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)) + , async () => (long?)await Service.CountAsync(req).ConfigureAwait(false), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)) .ConfigureAwait(false); return ret ?? 0; #else @@ -67,7 +67,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetBarChartAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); + , () => Service.GetBarChartAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); #else return Service.GetBarChartAsync(req); #endif @@ -79,7 +79,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetPieChartByApiSummaryAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); + , () => Service.GetPieChartByApiSummaryAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); #else return Service.GetPieChartByApiSummaryAsync(req); #endif @@ -91,7 +91,7 @@ public sealed class RequestLogCache(IDistributedCache cache, IRequestLogService #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.GetPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_CHART)); + , () => Service.GetPieChartByHttpStatusCodeAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_CHART)); #else return Service.GetPieChartByHttpStatusCodeAsync(req); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs index e6d336ed..583d2695 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RequestLogDetailCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs index 2ca9e783..16f1f52e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/RoleCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs index 60901ae5..55288eac 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs index 53744bed..0caae89d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgDeptCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgDept; +using NetAdmin.Domain.Dto.Sys.SiteMsgDept; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs index 6c061e00..e7034efb 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgFlagCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs index 51fb7452..a5fc3e01 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgRoleCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgRole; +using NetAdmin.Domain.Dto.Sys.SiteMsgRole; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs index 7830b886..3bc04b7a 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/SiteMsgUserCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgUser; +using NetAdmin.Domain.Dto.Sys.SiteMsgUser; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs index f1fe1d79..ba9fa959 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/ToolsCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +using NetAdmin.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserCache.cs index 6b1a03b4..62a406c7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserCache.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Cache.Sys; @@ -91,7 +91,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(userId.ToInvString()) // - , () => Service.LoginByUserIdAsync(userId), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_LOGIN_BY_USER_ID)); + , () => Service.LoginByUserIdAsync(userId), TimeSpan.FromSeconds(Numbers.SECS_CACHE_LOGIN_BY_USER_ID)); #else return Service.LoginByUserIdAsync(userId); #endif @@ -109,7 +109,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(req.Json().Crc32().ToString(CultureInfo.InvariantCulture)) // - , () => Service.QueryAsync(req), TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); + , () => Service.QueryAsync(req), TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); #else return Service.QueryAsync(req); #endif @@ -184,7 +184,7 @@ public sealed class UserCache(IDistributedCache cache, IUserService service, IVe #if !DEBUG return GetOrCreateAsync( // GetCacheKey(Service.UserToken.Id.ToString(CultureInfo.InvariantCulture)), Service.UserInfoAsync -, TimeSpan.FromSeconds(SysNumbers.SECS_CACHE_DEFAULT)); +, TimeSpan.FromSeconds(Numbers.SECS_CACHE_DEFAULT)); #else return Service.UserInfoAsync(); #endif diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs index 8f27e606..98a318b4 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/UserProfileCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs index b11444de..ad31cb4e 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Cache/Sys/VerifyCodeCache.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Cache.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj b/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj deleted file mode 100644 index 080c5908..00000000 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/NetAdmin.SysComponent.Domain.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/ProjectUsings.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/ProjectUsings.cs deleted file mode 100644 index dcf84574..00000000 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Domain/ProjectUsings.cs +++ /dev/null @@ -1,13 +0,0 @@ -global using NetAdmin.Domain; -global using NetAdmin.Domain.Attributes; -global using NetAdmin.Domain.Attributes.DataValidation; -global using NetAdmin.Domain.DbMaps.Dependency; -global using NetAdmin.Domain.DbMaps.Dependency.Fields; -global using NetAdmin.Domain.Dto.Dependency; -global using NetAdmin.SysComponent.Domain.DbMaps.Sys; -global using NetAdmin.SysComponent.Domain.Enums.Sys; -global using CsvIgnore = CsvHelper.Configuration.Attributes.IgnoreAttribute; -global using CsvIndex = CsvHelper.Configuration.Attributes.IndexAttribute; -global using CsvName = CsvHelper.Configuration.Attributes.NameAttribute; -global using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; -global using SqlIndex = FreeSql.DataAnnotations.IndexAttribute; \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs index 146481a0..0ca691da 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ApiController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs index ce540d95..4290b975 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CacheController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +using NetAdmin.Domain.Dto.Sys.Cache; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs index bfc255f7..6692fd95 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/CaptchaController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs index b68e544d..0915153f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ConfigController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.Dto.Sys.Config; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs index 5758fdca..8931125f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DeptController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Dept; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs index dbe4702c..e64686ae 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DevController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +using NetAdmin.Domain.Dto.Sys.Dev; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs index 1ad06fc5..20d30ea9 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/DicController.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs index c3688611..e66a252f 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/JobController.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs index dc6052f1..3f94e6ec 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/LoginLogController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Dto.Sys.LoginLog; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs index cb9450bd..7b00ff53 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/MenuController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Dto.Sys.Menu; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs index cd0cb3b0..f9a865c0 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RequestLogController.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs index 69be1de6..2d7b8ad7 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/RoleController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs index 2e7d2933..5cadd89d 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/SiteMsgController.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs index 04893e94..36e300da 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/ToolsController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +using NetAdmin.Domain.Dto.Sys.Tool; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs index 5e1603b6..dc03a586 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/UserController.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.UserProfile; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs index cb9f1ce8..a837eb01 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Controllers/Sys/VerifyCodeController.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace NetAdmin.SysComponent.Host.Controllers.Sys; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs index 1e47132f..3015dcb2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Extensions/ServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ using Gurion.Schedule; +using NetAdmin.Domain.Contexts; using NetAdmin.Domain.Events; using NetAdmin.Host.Filters; -using NetAdmin.SysComponent.Domain.Contexts; using NetAdmin.SysComponent.Host.Jobs; using NetAdmin.SysComponent.Host.Utils; using FreeSqlBuilder = NetAdmin.Infrastructure.Utils.FreeSqlBuilder; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs index 272e7871..9020da91 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Jobs/ScheduledJob.cs @@ -3,11 +3,10 @@ using Gurion.RemoteRequest; using Gurion.RemoteRequest.Extensions; using Gurion.Schedule; using NetAdmin.Application.Extensions; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; using NetAdmin.Host.BackgroundRunning; using NetAdmin.Host.Middlewares; -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; -using NetAdmin.SysComponent.Infrastructure.Constant; namespace NetAdmin.SysComponent.Host.Jobs; @@ -42,7 +41,7 @@ public sealed class ScheduledJob : WorkBase, IJob } // ReSharper disable once MethodSupportsCancellation - await Parallel.ForAsync(0, SysNumbers.SCHEDULED_JOB_PARALLEL_NUM, async (_, _) => await WorkflowAsync(stoppingToken).ConfigureAwait(false)) + await Parallel.ForAsync(0, Numbers.SCHEDULED_JOB_PARALLEL_NUM, async (_, _) => await WorkflowAsync(stoppingToken).ConfigureAwait(false)) .ConfigureAwait(false); } diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs index 7c8e0e99..489f90ef 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/CacheCleaner.cs @@ -1,5 +1,5 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs index 77243cb3..a2e82ea2 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/EmailCodeSender.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -using NetAdmin.SysComponent.Domain.Enums.Sys; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs index ee69c291..f874b006 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/OperationLogger.cs @@ -1,9 +1,8 @@ #if !DEBUG && DBTYPE_SQLSERVER using System.Collections.Concurrent; -using NetAdmin.SysComponent.Domain.DbMaps.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -using NetAdmin.SysComponent.Domain.Events.Sys; -using NetAdmin.SysComponent.Infrastructure.Constant; +using NetAdmin.Domain.DbMaps.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; @@ -24,7 +23,7 @@ public sealed class OperationLogger : IEventSubscriber return; } - if (_requestLogs.Count > SysNumbers.REQUEST_LOG_BUFF_SIZE) { + if (_requestLogs.Count > Numbers.REQUEST_LOG_BUFF_SIZE) { await WriteToDbAsync().ConfigureAwait(false); } else { @@ -34,10 +33,10 @@ public sealed class OperationLogger : IEventSubscriber private static async Task WriteToDbAsync() { - var inserts = new List(SysNumbers.REQUEST_LOG_BUFF_SIZE); + var inserts = new List(Numbers.REQUEST_LOG_BUFF_SIZE); // 批量入库 - for (var i = 0; i != SysNumbers.REQUEST_LOG_BUFF_SIZE; ++i) { + for (var i = 0; i != Numbers.REQUEST_LOG_BUFF_SIZE; ++i) { if (!_requestLogs.TryDequeue(out var log)) { continue; } @@ -63,7 +62,7 @@ public sealed class OperationLogger : IEventSubscriber } } #else -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs index 3cfe88bc..f6a98499 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Subscribers/SmsCodeSender.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; -using NetAdmin.SysComponent.Domain.Enums.Sys; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Enums.Sys; +using NetAdmin.Domain.Events.Sys; namespace NetAdmin.SysComponent.Host.Subscribers; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs index a4e760e0..71e0409b 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/RequestLogger.cs @@ -1,7 +1,7 @@ using NetAdmin.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLogDetail; -using NetAdmin.SysComponent.Domain.Events.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys.RequestLogDetail; +using NetAdmin.Domain.Events.Sys; using Yitter.IdGenerator; using HttpMethods = NetAdmin.Domain.Enums.HttpMethods; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs index 29ef37cd..c18ca431 100644 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs +++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Host/Utils/SqlAuditor.cs @@ -1,6 +1,6 @@ using NetAdmin.Domain.Attributes; +using NetAdmin.Domain.Contexts; using NetAdmin.Domain.DbMaps.Dependency.Fields; -using NetAdmin.SysComponent.Domain.Contexts; using Yitter.IdGenerator; namespace NetAdmin.SysComponent.Host.Utils; diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs deleted file mode 100644 index 052dc400..00000000 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysChars.cs +++ /dev/null @@ -1,14 +0,0 @@ -#pragma warning disable CS1591 - -namespace NetAdmin.SysComponent.Infrastructure.Constant; - -/// -/// 字符串常量表 -/// -/// -/// public类型会通过接口暴露给前端 -/// -public static class SysChars -{ - public const string FLG_PATH_API_SYS_USER_LOGIN_BY_PWD = "api/sys/user/login.by.pwd"; -} \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs deleted file mode 100644 index 9577a037..00000000 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/Constant/SysNumbers.cs +++ /dev/null @@ -1,22 +0,0 @@ -#pragma warning disable CS1591 - -namespace NetAdmin.SysComponent.Infrastructure.Constant; - -/// -/// 数字常量表 -/// -/// -/// public类型会通过接口暴露给前端 -/// -public static class SysNumbers -{ - public const long DEF_SORT_VAL = 100; // 默认值：排序字段 - public const long ID_DIC_CATALOG_GEO_AREA = 379794295185413; // 唯一编号：字典目录-行政区划字典 - public const int REQUEST_LOG_BUFF_SIZE = 1000; // 请求日志缓冲区大小 - public const int SCHEDULED_JOB_PARALLEL_NUM = 5; // 计划作业并发数 - public const int SECS_CACHE_CHART = 300; // 缓存时间（秒）：仪表 - public const int SECS_CACHE_DEFAULT = 60; // 缓存时间（秒）：默认 - public const int SECS_CACHE_DIC_CATALOG_CODE = 300; // 缓存时间（秒）：字典配置-目录代码 - public const int SECS_CACHE_LOGIN_BY_USER_ID = 3600 * 24 * 30; // 缓存时间（秒）：通过用户编号登录的用户信息 - public const int SECS_TIMEOUT_JOB = 180; // 超时时间（秒）：作业 -} \ No newline at end of file diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj b/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj deleted file mode 100644 index c0f1eca4..00000000 --- a/src/backend/NetAdmin/NetAdmin.SysComponent.Infrastructure/NetAdmin.SysComponent.Infrastructure.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - Languages/NetAdmin.SysComponent.Statements.ln - - - Languages/NetAdmin.SysComponent.Fields.ln - - - \ No newline at end of file diff --git a/src/backend/UnitTests/Sys/ApiTests.cs b/src/backend/UnitTests/Sys/ApiTests.cs index 0a167eb7..21e8da0c 100644 --- a/src/backend/UnitTests/Sys/ApiTests.cs +++ b/src/backend/UnitTests/Sys/ApiTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Api; +using NetAdmin.Domain.Dto.Sys.Api; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/CacheTests.cs b/src/backend/UnitTests/Sys/CacheTests.cs index 4e47300f..0cfb7716 100644 --- a/src/backend/UnitTests/Sys/CacheTests.cs +++ b/src/backend/UnitTests/Sys/CacheTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Cache; +using NetAdmin.Domain.Dto.Sys.Cache; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/CaptchaTests.cs b/src/backend/UnitTests/Sys/CaptchaTests.cs index 30f9a8f0..160fe465 100644 --- a/src/backend/UnitTests/Sys/CaptchaTests.cs +++ b/src/backend/UnitTests/Sys/CaptchaTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Captcha; +using NetAdmin.Domain.Dto.Sys.Captcha; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/ConfigTests.cs b/src/backend/UnitTests/Sys/ConfigTests.cs index 272bcc4e..142499a4 100644 --- a/src/backend/UnitTests/Sys/ConfigTests.cs +++ b/src/backend/UnitTests/Sys/ConfigTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Config; +using NetAdmin.Domain.Dto.Sys.Config; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/DeptTests.cs b/src/backend/UnitTests/Sys/DeptTests.cs index 7515ffde..ed44185b 100644 --- a/src/backend/UnitTests/Sys/DeptTests.cs +++ b/src/backend/UnitTests/Sys/DeptTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dept; +using NetAdmin.Domain.Dto.Sys.Dept; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/DevTests.cs b/src/backend/UnitTests/Sys/DevTests.cs index d27d8b1c..45a0f58b 100644 --- a/src/backend/UnitTests/Sys/DevTests.cs +++ b/src/backend/UnitTests/Sys/DevTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dev; +using NetAdmin.Domain.Dto.Sys.Dev; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/DicTests.cs b/src/backend/UnitTests/Sys/DicTests.cs index c8fdca63..5986eb70 100644 --- a/src/backend/UnitTests/Sys/DicTests.cs +++ b/src/backend/UnitTests/Sys/DicTests.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Catalog; -using NetAdmin.SysComponent.Domain.Dto.Sys.Dic.Content; +using NetAdmin.Domain.Dto.Sys.Dic.Catalog; +using NetAdmin.Domain.Dto.Sys.Dic.Content; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/JobTests.cs b/src/backend/UnitTests/Sys/JobTests.cs index 01384cef..8ffb62f5 100644 --- a/src/backend/UnitTests/Sys/JobTests.cs +++ b/src/backend/UnitTests/Sys/JobTests.cs @@ -1,6 +1,6 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.Job; -using NetAdmin.SysComponent.Domain.Dto.Sys.JobRecord; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.Job; +using NetAdmin.Domain.Dto.Sys.JobRecord; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/LoginLogTests.cs b/src/backend/UnitTests/Sys/LoginLogTests.cs index 0cef2916..cce843a8 100644 --- a/src/backend/UnitTests/Sys/LoginLogTests.cs +++ b/src/backend/UnitTests/Sys/LoginLogTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.LoginLog; +using NetAdmin.Domain.Dto.Sys.LoginLog; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/MenuTests.cs b/src/backend/UnitTests/Sys/MenuTests.cs index 91a9bf81..99562ee1 100644 --- a/src/backend/UnitTests/Sys/MenuTests.cs +++ b/src/backend/UnitTests/Sys/MenuTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Menu; +using NetAdmin.Domain.Dto.Sys.Menu; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/RequestLogTests.cs b/src/backend/UnitTests/Sys/RequestLogTests.cs index 7d62c8a2..3cde9c31 100644 --- a/src/backend/UnitTests/Sys/RequestLogTests.cs +++ b/src/backend/UnitTests/Sys/RequestLogTests.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys; -using NetAdmin.SysComponent.Domain.Dto.Sys.RequestLog; +using NetAdmin.Domain.Dto.Sys; +using NetAdmin.Domain.Dto.Sys.RequestLog; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/RoleTests.cs b/src/backend/UnitTests/Sys/RoleTests.cs index a6b4c8f0..f4ce8a29 100644 --- a/src/backend/UnitTests/Sys/RoleTests.cs +++ b/src/backend/UnitTests/Sys/RoleTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Role; +using NetAdmin.Domain.Dto.Sys.Role; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/SiteMsgTests.cs b/src/backend/UnitTests/Sys/SiteMsgTests.cs index 498f66c6..d9181f44 100644 --- a/src/backend/UnitTests/Sys/SiteMsgTests.cs +++ b/src/backend/UnitTests/Sys/SiteMsgTests.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsg; -using NetAdmin.SysComponent.Domain.Dto.Sys.SiteMsgFlag; +using NetAdmin.Domain.Dto.Sys.SiteMsg; +using NetAdmin.Domain.Dto.Sys.SiteMsgFlag; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/ToolsTests.cs b/src/backend/UnitTests/Sys/ToolsTests.cs index 559c5fa4..45b87698 100644 --- a/src/backend/UnitTests/Sys/ToolsTests.cs +++ b/src/backend/UnitTests/Sys/ToolsTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.Tool; +using NetAdmin.Domain.Dto.Sys.Tool; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/UserTests.cs b/src/backend/UnitTests/Sys/UserTests.cs index 395cbd52..7db3897e 100644 --- a/src/backend/UnitTests/Sys/UserTests.cs +++ b/src/backend/UnitTests/Sys/UserTests.cs @@ -1,5 +1,5 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Domain.Dto.Sys.UserProfile; +using NetAdmin.Domain.Dto.Sys.User; +using NetAdmin.Domain.Dto.Sys.UserProfile; using NetAdmin.Tests.Attributes; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/Sys/VerifyCodeTests.cs b/src/backend/UnitTests/Sys/VerifyCodeTests.cs index 5903061b..6d8ae76f 100644 --- a/src/backend/UnitTests/Sys/VerifyCodeTests.cs +++ b/src/backend/UnitTests/Sys/VerifyCodeTests.cs @@ -1,4 +1,4 @@ -using NetAdmin.SysComponent.Domain.Dto.Sys.VerifyCode; +using NetAdmin.Domain.Dto.Sys.VerifyCode; namespace UnitTests.Sys; diff --git a/src/backend/UnitTests/WebApiTestBase.cs b/src/backend/UnitTests/WebApiTestBase.cs index 990441ba..db2eb011 100644 --- a/src/backend/UnitTests/WebApiTestBase.cs +++ b/src/backend/UnitTests/WebApiTestBase.cs @@ -2,9 +2,8 @@ using System.Net.Http.Headers; using System.Net.Http.Json; using System.Runtime.CompilerServices; using NetAdmin.Domain.Dto; +using NetAdmin.Domain.Dto.Sys.User; using NetAdmin.Host.Extensions; -using NetAdmin.SysComponent.Domain.Dto.Sys.User; -using NetAdmin.SysComponent.Infrastructure.Constant; namespace UnitTests; @@ -60,7 +59,7 @@ public abstract class WebApiTestBase(WebTestApplicationFactory factory, IT }; var loginAccount = JsonContent.Create(req); var rspMsg = await client.PostAsync( // - SysChars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD, loginAccount) + Chars.FLG_PATH_API_SYS_USER_LOGIN_BY_PWD, loginAccount) .ConfigureAwait(false); var rspObj = (await rspMsg.Content.ReadAsStringAsync().ConfigureAwait(false)).ToObject>(); _accessToken = rspObj.Data.AccessToken; diff --git a/src/backend/YourSolution.AdmServer.Domain/YourSolution.AdmServer.Domain.csproj b/src/backend/YourSolution.AdmServer.Domain/YourSolution.AdmServer.Domain.csproj index 4ac2ac53..1a31c34e 100644 --- a/src/backend/YourSolution.AdmServer.Domain/YourSolution.AdmServer.Domain.csproj +++ b/src/backend/YourSolution.AdmServer.Domain/YourSolution.AdmServer.Domain.csproj @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/backend/YourSolution.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs b/src/backend/YourSolution.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs index 27082cf2..4ff15ade 100644 --- a/src/backend/YourSolution.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs +++ b/src/backend/YourSolution.AdmServer.Host/Extensions/ServiceCollectionExtensions.cs @@ -1,6 +1,6 @@ +using NetAdmin.Domain.Contexts; using NetAdmin.Domain.DbMaps.Dependency.Fields; -using NetAdmin.SysComponent.Domain.Contexts; -using NetAdmin.SysComponent.Domain.Enums.Sys; +using NetAdmin.Domain.Enums.Sys; using NetAdmin.SysComponent.Host.Extensions; using YourSolution.AdmServer.Host.Filters; diff --git a/src/backend/YourSolution.AdmServer.Infrastructure/AdmSettings.json b/src/backend/YourSolution.AdmServer.Infrastructure/AdmSettings.json index 81989744..3792009d 100644 --- a/src/backend/YourSolution.AdmServer.Infrastructure/AdmSettings.json +++ b/src/backend/YourSolution.AdmServer.Infrastructure/AdmSettings.json @@ -31,14 +31,12 @@ "NetAdmin.Infrastructure.xml", "NetAdmin.SysComponent.Application.xml", "NetAdmin.SysComponent.Cache.xml", - "NetAdmin.SysComponent.Domain.xml", "NetAdmin.SysComponent.Host.xml", - "NetAdmin.SysComponent.Infrastructure.xml", "YourSolution.AdmServer.Application.xml", "YourSolution.AdmServer.Cache.xml", "YourSolution.AdmServer.Domain.xml", "YourSolution.AdmServer.Host.xml", - "YourSolution.AdmServer.Infrastructure.xml", + "YourSolution.AdmServer.Infrastructure.xml" ] }, // 数据库配置 -------------------------------------------------------------------------------------------------------- diff --git a/src/backend/YourSolution.AdmServer.Infrastructure/YourSolution.AdmServer.Infrastructure.csproj b/src/backend/YourSolution.AdmServer.Infrastructure/YourSolution.AdmServer.Infrastructure.csproj index b4d6d6fb..8769f54b 100644 --- a/src/backend/YourSolution.AdmServer.Infrastructure/YourSolution.AdmServer.Infrastructure.csproj +++ b/src/backend/YourSolution.AdmServer.Infrastructure/YourSolution.AdmServer.Infrastructure.csproj @@ -1,7 +1,7 @@ - + diff --git a/src/frontend/admin/src/views/dev/code/index.vue b/src/frontend/admin/src/views/dev/code/index.vue index 3ac44596..b6e88c27 100644 --- a/src/frontend/admin/src/views/dev/code/index.vue +++ b/src/frontend/admin/src/views/dev/code/index.vue @@ -118,7 +118,7 @@ export default { /// 模块说明 moduleRemark: '', /// 模块类型 - type: 'NetAdmin.SysComponent', + type: 'YourSolution.AdmServer', }, } },