init

.gitignore

@@ -259,16 +259,16 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-/ZR.Admin.WebApi/appsettings.Development.json
+/DOAN.Admin.WebApi/appsettings.Development.json
 /CodeGenerate
-/ZR.Admin.WebApi/appsettings.Production.json
-/ZR.Admin.WebApi/wwwroot/uploads
-/ZR.Admin.WebApi/wwwroot/Generatecode
-/ZR.Admin.WebApi/wwwroot/export
-/ZR.Vue/src/views/business/Gendemo.vue
-/ZR.Admin.WebApi/Properties/launchSettings.json
-/ZR.Admin.WebApi/ZRAdmin.xml
-/ZR.Admin.WebApi/DataProtection
+/DOAN.Admin.WebApi/appsettings.Production.json
+/DOAN.Admin.WebApi/wwwroot/uploads
+/DOAN.Admin.WebApi/wwwroot/Generatecode
+/DOAN.Admin.WebApi/wwwroot/export
+/DOAN.Vue/src/views/business/Gendemo.vue
+/DOAN.Admin.WebApi/Properties/launchSettings.json
+/DOAN.Admin.WebApi/DOANAdmin.xml
+/DOAN.Admin.WebApi/DataProtection
 /Quartz.NET.WindowsService
-/ZRAdmin-vue
-/ZR.Admin.WebApi/ZRModel.xml
+/DOANAdmin-vue
+/DOAN.Admin.WebApi/DOANModel.xml

DOAN.Admin.WebApi/Controllers/Article/ArticleCategoryController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Service.Content.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文章目录Controller

DOAN.Admin.WebApi/Controllers/Article/ArticleController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Service.Content.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 内容管理

DOAN.Admin.WebApi/Controllers/Article/ArticleTopicController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Service.Content.IService;
 
 //创建时间：2024-04-29
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文章话题

DOAN.Admin.WebApi/Controllers/Article/FrontArticleController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Service.Content.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 内容管理前端接口

DOAN.Admin.WebApi/Controllers/Article/FrontCommentController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Service.Content.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 评论

DOAN.Admin.WebApi/Controllers/Article/MomentsController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Content;
-using ZR.Model.Content.Dto;
-using ZR.Model.Enum;
-using ZR.Service.Content.IService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Content;
+using DOAN.Model.Content.Dto;
+using DOAN.Model.Enum;
+using DOAN.Service.Content.IService;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     [Verify]
     [Route("moment")]

DOAN.Admin.WebApi/Controllers/CommonController.cs

@@ -2,13 +2,13 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using MiniExcelLibs;
-using ZR.Admin.WebApi.Filters;
-using ZR.Infrastructure.IPTools;
-using ZR.Model.Dto;
-using ZR.Model.System;
-using ZR.ServiceCore.Resources;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Infrastructure.IPTools;
+using DOAN.Model.Dto;
+using DOAN.Model.System;
+using DOAN.ServiceCore.Resources;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 公共模块

DOAN.Admin.WebApi/Controllers/Email/EmailLogController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Dto;
-using ZR.Model.Models;
-using ZR.ServiceCore.Model;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Model.Models;
+using DOAN.ServiceCore.Model;
 
 //创建时间：2023-11-20
-namespace ZR.Admin.WebApi.Controllers.Email
+namespace DOAN.Admin.WebApi.Controllers.Email
 {
     /// <summary>
     /// 邮件发送记录

DOAN.Admin.WebApi/Controllers/Email/EmailTplController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Dto;
-using ZR.Model.Models;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.Model.Models;
 
 //创建时间：2023-11-12
-namespace ZR.Admin.WebApi.Controllers.Email
+namespace DOAN.Admin.WebApi.Controllers.Email
 {
     /// <summary>
     /// 邮件模板

DOAN.Admin.WebApi/Controllers/Public/BannerConfigController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Model.Public.Dto;
-using ZR.Model.Public;
-using ZR.Service.Public.IPublicService;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Model.Public.Dto;
+using DOAN.Model.Public;
+using DOAN.Service.Public.IPublicService;
+using DOAN.Admin.WebApi.Filters;
 
 //创建时间：2024-05-11
-namespace ZR.Admin.WebApi.Controllers.Public
+namespace DOAN.Admin.WebApi.Controllers.Public
 {
     /// <summary>
     /// 广告管理

DOAN.Admin.WebApi/Controllers/System/CodeGeneratorController.cs

@@ -1,15 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.CodeGenerator;
-using ZR.CodeGenerator.Model;
-using ZR.CodeGenerator.Service;
-using ZR.Model;
-using ZR.Model.System.Dto;
-using ZR.Model.System.Generate;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.CodeGenerator;
+using DOAN.CodeGenerator.Model;
+using DOAN.CodeGenerator.Service;
+using DOAN.Model;
+using DOAN.Model.System.Dto;
+using DOAN.Model.System.Generate;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 代码生成
@@ -259,7 +259,7 @@ namespace ZR.Admin.WebApi.Controllers
             dto.DbType = OptionsSetting.CodeGenDbConfig.DbType;
             dto.GenTable = GenTableService.GetGenTableInfo(dto.TableId);
             //生成压缩包
-            string zipReturnFileName = $"ZrAdmin.NET-{dto.GenTable.TableName}-{DateTime.Now:MMddHHmmss}.zip";
+            string zipReturnFileName = $"DOANAdmin.NET-{dto.GenTable.TableName}-{DateTime.Now:MMddHHmmss}.zip";
 
             //生成代码到指定文件夹
             CodeGeneratorTool.Generate(dto);

DOAN.Admin.WebApi/Controllers/System/CommonLangController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Models;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.Dto;
+using DOAN.Model.Models;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 多语言配置Controller

DOAN.Admin.WebApi/Controllers/System/SysConfigController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 参数配置Controller

DOAN.Admin.WebApi/Controllers/System/SysDeptController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 部门

DOAN.Admin.WebApi/Controllers/System/SysDictDataController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 数据字典信息

DOAN.Admin.WebApi/Controllers/System/SysDictTypeController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 数据字典信息

DOAN.Admin.WebApi/Controllers/System/SysFileController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 文件存储Controller

DOAN.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -1,12 +1,12 @@
 using Lazy.Captcha.Core;
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Models;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Model.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Models;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.ServiceCore.Model.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 登录

DOAN.Admin.WebApi/Controllers/System/SysMenuController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 系统菜单

DOAN.Admin.WebApi/Controllers/System/SysNoticeController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Signalr;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
+using DOAN.ServiceCore.Signalr;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 系统通知

DOAN.Admin.WebApi/Controllers/System/SysPostController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Repository;
-using ZR.ServiceCore.Model.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Repository;
+using DOAN.ServiceCore.Model.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 岗位管理

DOAN.Admin.WebApi/Controllers/System/SysProfileController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 个人中心

DOAN.Admin.WebApi/Controllers/System/SysRoleController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 角色信息

DOAN.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 用户管理

DOAN.Admin.WebApi/Controllers/System/SysUserMsgController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.Dto;
 
 //创建时间：2024-05-08
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 用户系统消息

DOAN.Admin.WebApi/Controllers/System/SysUserRoleController.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 用户角色管理

DOAN.Admin.WebApi/Controllers/System/TasksController.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Quartz;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-using ZR.Tasks;
+using DOAN.Tasks;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 计划任务

DOAN.Admin.WebApi/Controllers/System/TasksLogController.cs

@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace DOAN.Admin.WebApi.Controllers.System
 {
     /// <summary>
     /// 任务日志

DOAN.Admin.WebApi/Controllers/System/monitor/MonitorController.cs

@@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using ZR.Admin.WebApi.Filters;
+using DOAN.Admin.WebApi.Filters;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 系统监控

DOAN.Admin.WebApi/Controllers/System/monitor/SmsCodeLogController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Dto;
-using ZR.ServiceCore.Services;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.ServiceCore.Services;
 
 //创建时间：2023-11-19
-namespace ZR.Admin.WebApi.Controllers.System.monitor
+namespace DOAN.Admin.WebApi.Controllers.System.monitor
 {
     /// <summary>
     /// 短信验证码记录

DOAN.Admin.WebApi/Controllers/System/monitor/SqlDiffLogController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
 
 
 //创建时间：2023-08-17
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 数据差异日志

DOAN.Admin.WebApi/Controllers/System/monitor/SysLogininforController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 系统访问记录

DOAN.Admin.WebApi/Controllers/System/monitor/SysOperlogController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.System.Dto;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.System.Dto;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 操作日志记录

DOAN.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model;
-using ZR.Model.System.Dto;
-using ZR.ServiceCore.Signalr;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.System.Dto;
+using DOAN.ServiceCore.Signalr;
 
-namespace ZR.Admin.WebApi.Controllers.monitor
+namespace DOAN.Admin.WebApi.Controllers.monitor
 {
     /// <summary>
     /// 在线用户

DOAN.Admin.WebApi/Controllers/System/monitor/UserOnlineLogController.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Filters;
-using ZR.Model.Dto;
-using ZR.ServiceCore.Monitor.IMonitorService;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.Dto;
+using DOAN.ServiceCore.Monitor.IMonitorService;
 
 //创建时间：2024-03-27
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 用户在线时长

DOAN.Admin.WebApi/Controllers/WxOpenController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Web;
 
-namespace ZR.Admin.WebApi.Controllers
+namespace DOAN.Admin.WebApi.Controllers
 {
     /// <summary>
     /// 微信公众号

DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj

@@ -12,9 +12,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\ZR.CodeGenerator\ZR.CodeGenerator.csproj" />
-		<ProjectReference Include="..\ZR.Service\ZR.Service.csproj" />
-		<ProjectReference Include="..\ZR.Tasks\ZR.Tasks.csproj" />
+		<ProjectReference Include="..\DOAN.CodeGenerator\DOAN.CodeGenerator.csproj" />
+		<ProjectReference Include="..\DOAN.Service\DOAN.Service.csproj" />
+		<ProjectReference Include="..\DOAN.Tasks\DOAN.Tasks.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Lazy.Captcha.Core" Version="2.0.9" />

DOAN.Admin.WebApi/Dockerfile

@@ -0,0 +1,32 @@
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 8888
+
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG BUILD_CONFIGURATION=Release
+WORKDIR /src
+COPY ["DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj", "DOAN.Admin.WebApi/"]
+COPY ["DOAN.CodeGenerator/DOAN.CodeGenerator.csproj", "DOAN.CodeGenerator/"]
+COPY ["Infrastructure/DOAN.Infrastructure.csproj", "Infrastructure/"]
+COPY ["DOAN.Common/DOAN.Common.csproj", "DOAN.Common/"]
+COPY ["DOAN.ServiceCore/DOAN.ServiceCore.csproj", "DOAN.ServiceCore/"]
+COPY ["DOAN.Repository/DOAN.Repository.csproj", "DOAN.Repository/"]
+COPY ["DOAN.Model/DOAN.Model.csproj", "DOAN.Model/"]
+COPY ["DOAN.Service/DOAN.Service.csproj", "DOAN.Service/"]
+COPY ["DOAN.Tasks/DOAN.Tasks.csproj", "DOAN.Tasks/"]
+RUN dotnet restore "./DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj"
+COPY . .
+WORKDIR "/src/DOAN.Admin.WebApi"
+RUN dotnet build "./DOAN.Admin.WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+FROM build AS publish
+ARG BUILD_CONFIGURATION=Release
+RUN dotnet publish "./DOAN.Admin.WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "DOAN.Admin.WebApi.dll"]

DOAN.Admin.WebApi/Extensions/SwaggerExtension.cs

@@ -4,7 +4,7 @@ using Swashbuckle.AspNetCore.Filters;
 using Swashbuckle.AspNetCore.SwaggerUI;
 using System.Reflection;
 
-namespace ZR.Admin.WebApi.Extensions
+namespace DOAN.Admin.WebApi.Extensions
 {
     public static class SwaggerExtension
     {
@@ -51,21 +51,21 @@ namespace ZR.Admin.WebApi.Extensions
             {
                 c.SwaggerDoc("sys", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "系统管理",
-                    Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
+                    Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
                 });
                 c.SwaggerDoc("article", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "文章管理",
-                    Contact = new OpenApiContact { Name = "ZRAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
+                    Contact = new OpenApiContact { Name = "DOANAdmin doc", Url = new Uri("https://www.izhaorui.cn/doc") }
                 });
                 c.SwaggerDoc("v1", new OpenApiInfo
                 {
-                    Title = "ZrAdmin.NET Api",
+                    Title = "DOANAdmin.NET Api",
                     Version = "v1",
                     Description = "",
                 });
@@ -74,10 +74,10 @@ namespace ZR.Admin.WebApi.Extensions
                     //var tempPath = hostEnvironment.ContentRootPath;
                     //添加文档注释
                     var baseDir = AppContext.BaseDirectory;
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Model.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.ServiceCore.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Service.xml"), true);
-                    c.IncludeXmlComments(Path.Combine(baseDir, "ZR.Admin.WebApi.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Model.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.ServiceCore.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Service.xml"), true);
+                    c.IncludeXmlComments(Path.Combine(baseDir, "DOAN.Admin.WebApi.xml"), true);
 
                     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
                     var xmlPath = Path.Combine(baseDir, xmlFile);

DOAN.Admin.WebApi/Extensions/TasksExtension.cs

@@ -1,10 +1,10 @@
 using Quartz.Spi;
 using SqlSugar;
 using SqlSugar.IOC;
-using ZR.Model.System;
-using ZR.Tasks;
+using DOAN.Model.System;
+using DOAN.Tasks;
 
-namespace ZR.Admin.WebApi.Extensions
+namespace DOAN.Admin.WebApi.Extensions
 {
     /// <summary>
     /// 定时任务扩展方法

DOAN.Admin.WebApi/GlobalUsing.cs

@@ -1,4 +1,4 @@
-global using ZR.Common;
+global using DOAN.Common;
 global using Microsoft.AspNetCore.Authorization;
 global using Infrastructure;
 global using Infrastructure.Attribute;
@@ -7,5 +7,5 @@ global using Infrastructure.Model;
 global using Mapster;
 global using Infrastructure.Extensions;
 global using Infrastructure.Controllers;
-global using ZR.ServiceCore.Middleware;
-global using ZR.ServiceCore.Services;
+global using DOAN.ServiceCore.Middleware;
+global using DOAN.ServiceCore.Services;

DOAN.Admin.WebApi/Program.cs

@@ -6,12 +6,12 @@ using NLog.Web;
 using SqlSugar;
 using System.Globalization;
 using System.Text.Json;
-using ZR.Admin.WebApi.Extensions;
-using ZR.Common.Cache;
-using ZR.Common.DynamicApiSimple.Extens;
-using ZR.Infrastructure.WebExtensions;
-using ZR.ServiceCore.Signalr;
-using ZR.ServiceCore.SqlSugar;
+using DOAN.Admin.WebApi.Extensions;
+using DOAN.Common.Cache;
+using DOAN.Common.DynamicApiSimple.Extens;
+using DOAN.Infrastructure.WebExtensions;
+using DOAN.ServiceCore.Signalr;
+using DOAN.ServiceCore.SqlSugar;
 
 var builder = WebApplication.CreateBuilder(args);
 // NLog: Setup NLog for Dependency injection

DOAN.Admin.WebApi/appsettings.json

@@ -0,0 +1,97 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+
+
+ 
+  "JwtSettings": {
+    "Issuer": "DOANAdmin.NET", //即token的签发者。
+    "Audience": "DOANAdmin.NET", //指该token是服务于哪个群体的（群体范围）
+    "SecretKey": "SecretKey-DOANADMIN.NET-202411281883838",
+    "Expire": 600000, //jwt登录过期时间（分）
+    "RefreshTokenTime": 6000, //分钟
+    "TokenType": "Bearer"
+  },
+  "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类
+  "ShowDbLog": true, //是否打印db日志
+  "InitDb": false, //(新建项目的时候需要)是否初始化db
+  "DemoMode": false, //是否演示模式
+  "SingleLogin": false, //是否允许多设备/浏览器登录
+  "workId": 1, //雪花id唯一数字
+  "sqlExecutionTime": 5, //Sql执行时间超过多少秒记录日志并警报
+  "Upload": {
+    "uploadUrl": "http://127.0.0.1:8888", //本地存储资源访问路径
+    "localSavePath": "", //本地上传默认文件存储目录 wwwroot
+    "maxSize": 30, //上传文件大小限制 15M
+    "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ],
+    "requestLimitSize": 100 //请求body大小限制
+  },
+  //阿里云存储配置
+  "ALIYUN_OSS": {
+    "REGIONID": "", //eg：cn-hangzhou
+    "KEY": "XX",
+    "SECRET": "XX",
+    "bucketName": "bucketName",
+    "domainUrl": "http://xxx.xxx.com", //访问资源域名
+    "maxSize": 100 //上传文件大小限制 100M
+  },
+  //企业微信通知配置
+  "WxCorp": {
+    "AgentID": "",
+    "CorpID": "",
+    "CorpSecret": "",
+    "SendUser": "@all"
+  },
+  //微信公众号设置
+  "WxOpen": {
+    "AppID": "",
+    "AppSecret": ""
+  },
+  //邮箱配置信息
+  "MailOptions": [
+    {
+      //发件人名称(请保证数组里面唯一)
+      "FromName": "system",
+      //发送人邮箱
+      "FromEmail": "", //eg：xxxx@qq.com
+      //发送人邮箱密码
+      "Password": "",
+      //协议
+      "Smtp": "smtp.qq.com",
+      "Port": 587,
+      "Signature": "系统邮件，请勿回复！",
+      "UseSsl": true
+    }
+  ],
+  //redis服务配置
+  "RedisServer": {
+    "open": 0, //是否启用redis
+    "dbCache": false, //数据库是否使用Redis缓存，如果启用open要为1
+    "Cache": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:",
+    "Session": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:"
+  },
+  //验证码配置
+  "CaptchaOptions": {
+    "IgnoreCase": true // 比较时是否忽略大小写
+  },
+  //代码生成配置
+  "CodeGen": {
+    //uniapp 版本号2/3(vue版本号)
+    "uniappVersion": 3,
+    //是否显示移动端代码生成
+    "showApp": true,
+    //自动去除表前缀
+    "autoPre": true,
+    //默认生成业务模块名
+    "moduleName": "BZFM",
+    "author": "mes",
+    "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
+    "vuePath": "", //前端代码存储路径eg：D:\Work\DOANAdmin-Vue3
+    "uniappPath": "D:\\Work" //h5前端代码存储路径
+  }
+}

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/MySqlTemplate.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- 菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/PgSql.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- ${genTable.functionName}菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/CodeGenTemplate/sql/SqlTemplate.txt

@@ -1,4 +1,4 @@
-use ZrAdmin;
+use DOANAdmin;
 
 -- ${genTable.functionName}菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 

DOAN.Admin.WebApi/wwwroot/logo.txt

@@ -0,0 +1,7 @@
+                                 _____   ____          _   
+| |  | | |  | | /  \  |  \| |______| \  / | |__  | (___  
+| |  | | |  | |/ /\ \ | . ` |______| |\/| |  __|  \___ \ 
+| |__| | |__| / ____ \| |\  |      | |  | | |____ ____) |
+|_____/ \____/_/    \_\_| \_|      |_|  |_|______|_____/ 
+  
+                                                                                                    

DOAN.CodeGenerator/CodeGeneratorTool.cs

@@ -8,10 +8,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using ZR.CodeGenerator.Model;
-using ZR.Model.System.Generate;
+using DOAN.CodeGenerator.Model;
+using DOAN.Model.System.Generate;
 
-namespace ZR.CodeGenerator
+namespace DOAN.CodeGenerator
 {
     /// <summary>
     /// 代码生成器
@@ -445,7 +445,7 @@ namespace ZR.CodeGenerator
             GenTable genTable = new()
             {
                 DbName = dto.DbName,
-                BaseNameSpace = "ZR.",//导入默认命名空间前缀
+                BaseNameSpace = "DOAN.",//导入默认命名空间前缀
                 ModuleName = dto.CodeGen.ModuleName,//导入默认模块名
                 ClassName = className,
                 BusinessName = className,

DOAN.CodeGenerator/DOAN.CodeGenerator.csproj

@@ -5,9 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\Infrastructure\ZR.Infrastructure.csproj" />
-		<ProjectReference Include="..\ZR.Common\ZR.Common.csproj" />
-		<ProjectReference Include="..\ZR.ServiceCore\ZR.ServiceCore.csproj" />
+		<ProjectReference Include="..\Infrastructure\DOAN.Infrastructure.csproj" />
+		<ProjectReference Include="..\DOAN.Common\DOAN.Common.csproj" />
+		<ProjectReference Include="..\DOAN.ServiceCore\DOAN.ServiceCore.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

DOAN.CodeGenerator/DbProvider.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace ZR.CodeGenerator
+namespace DOAN.CodeGenerator
 {
     /// <summary>
     /// 代码生成数据库连接

DOAN.CodeGenerator/GenConstants.cs

@@ -1,6 +1,6 @@
 
 
-namespace ZR.CodeGenerator
+namespace DOAN.CodeGenerator
 {
     /// <summary>
     /// 代码生成常量

DOAN.CodeGenerator/Model/CodeGenerateOption.cs

@@ -1,4 +1,4 @@
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     public class CodeGenerateOption
     {

DOAN.CodeGenerator/Model/GenerateDto.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using ZR.Model.System.Generate;
+using DOAN.Model.System.Generate;
 
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     public class GenerateDto
     {
@@ -60,7 +60,7 @@ namespace ZR.CodeGenerator.Model
         /// <summary>
         /// uniapp存储路径
         /// </summary>
-        public string AppVuePath { get; set; } = "ZRAdminn-app";
+        public string AppVuePath { get; set; } = "DOANAdminn-app";
         #endregion
         public ReplaceDto ReplaceDto { get; set; }
     }

DOAN.CodeGenerator/Model/ImportCodeGenTableDto.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     public class ImportCodeGenTableDto
     {

DOAN.CodeGenerator/Model/InitTableDto.cs

@@ -1,6 +1,6 @@
 using Infrastructure.Model;
 
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     public class InitTableDto
     {

DOAN.CodeGenerator/Model/OracleSeq.cs

@@ -1,4 +1,4 @@
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     /// <summary>
     /// Oracle库序列

DOAN.CodeGenerator/Model/ReplaceDto.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ZR.CodeGenerator.Model
+namespace DOAN.CodeGenerator.Model
 {
     public class ReplaceDto
     {

DOAN.CodeGenerator/Service/CodeGeneraterService.cs

@@ -3,10 +3,10 @@ using Infrastructure.Model;
 using SqlSugar;
 using System.Collections.Generic;
 using System.Linq;
-using ZR.CodeGenerator.Model;
-using ZR.Model;
+using DOAN.CodeGenerator.Model;
+using DOAN.Model;
 
-namespace ZR.CodeGenerator.Service
+namespace DOAN.CodeGenerator.Service
 {
     public class CodeGeneraterService : DbProvider
     {

DOAN.Common/AliyunOssHelper.cs

@@ -4,7 +4,7 @@ using Infrastructure;
 using System;
 using System.IO;
 
-namespace ZR.Common
+namespace DOAN.Common
 {
     public class AliyunOssHelper
     { 

DOAN.Common/DOAN.Common.csproj

@@ -11,6 +11,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\Infrastructure\ZR.Infrastructure.csproj" />
+		<ProjectReference Include="..\Infrastructure\DOAN.Infrastructure.csproj" />
 	</ItemGroup>
 </Project>

DOAN.Common/DynamicApiSimple/ApiConvention.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace ZR.Common.DynamicApiSimple;
+namespace DOAN.Common.DynamicApiSimple;
 
 class ApiConvention : IApplicationModelConvention
 {

DOAN.Common/DynamicApiSimple/ApiFeatureProvider.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
 
-namespace ZR.Common.DynamicApiSimple;
+namespace DOAN.Common.DynamicApiSimple;
 
 class ApiFeatureProvider : ControllerFeatureProvider
 {

DOAN.Common/DynamicApiSimple/DynamicApiAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ZR.Common.DynamicApiSimple
+namespace DOAN.Common.DynamicApiSimple
 {
     /// <summary>
     /// 动态api属性

DOAN.Common/DynamicApiSimple/Extens/DynamicApiExtens.cs

@@ -7,7 +7,7 @@ using Newtonsoft.Json.Serialization;
 using System.Linq;
 using System.Reflection;
 
-namespace ZR.Common.DynamicApiSimple.Extens
+namespace DOAN.Common.DynamicApiSimple.Extens
 {
     public static class DynamicApiExtens
     {

DOAN.Common/DynamicApiSimple/IDynamicApi.cs

@@ -1,4 +1,4 @@
-namespace ZR.Common.DynamicApiSimple
+namespace DOAN.Common.DynamicApiSimple
 {
     public interface IDynamicApi
     {

DOAN.Common/DynamicApiSimple/JsonModelBinder.cs

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Newtonsoft.Json;
 
-namespace ZR.Common.DynamicApiSimple;
+namespace DOAN.Common.DynamicApiSimple;
 
 public class JsonModelBinder : IModelBinder
 {

DOAN.Common/ExcelHelper.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 
-namespace ZR.Common
+namespace DOAN.Common
 {
     public class ExcelHelper<T> where T : new()
     {

DOAN.Common/MailHelper.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace ZR.Common
+namespace DOAN.Common
 {
     public class MailHelper
     {