update README.md

Merge pull request !39 from xbzhu/N/A

.gitee/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1,88 @@
+name: 问题反馈
+description: 当你在代码中发现了一个 Bug，导致应用崩溃或抛出异常，或者有一个组件存在问题，或者某些地方看起来不对劲。
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢对项目的支持与关注。在提出问题之前，请确保你已查看相关开发或使用文档：
+        - http://www.izhaorui.cn/doc
+  - type: checkboxes
+    attributes:
+      label: 这个问题是否已经存在？
+      options:
+        - label: 我已经搜索过现有的问题 (https://gitee.com/../../issues)
+          required: true
+  - type: checkboxes
+    attributes:
+      label: 代码是否是最新获取的？
+      options:
+        - label: 我已经确认代码是最新主分支的代码
+          required: true		  
+  - type: textarea
+    attributes:
+      label: 如何复现
+      description: 请详细告诉我们如何复现你遇到的问题，如涉及代码，可提供一个最小代码示例，并使用反引号```附上它
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 预期结果
+      description: 请告诉我们你预期会发生什么。
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: 实际结果
+      description: 请告诉我们实际发生了什么。
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: 截图或视频
+      description: 如果可以的话，上传任何关于 bug 的截图。
+      value: |
+        [在这里上传图片]
+  - type: dropdown
+    id: version
+    attributes:
+      label: vue版本
+      description: 你当前正在使用我们软件的哪个前端版本
+      options:
+        - vue3 (默认)
+        - vue2 
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: 运行环境
+      options:
+        - 开发环境 (development)
+        - 生产环境（production） 
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: 应用程序托管
+      options:
+        - 前端iis + 后端iis
+        - 前端nginx + 后端 iis
+        - 前端nginx + 后端自启动
+        - docker
+        - 其他
+    validations:
+      required: true
+contact_links:
+  - name: 使用文档
+    url: http://www.izhaorui.cn/doc/
+    about: 官方文档
+  - name: ♥️ VIP 服务 ♥️
+    url: https://www.izhaorui.cn/doc/support.html
+    about: 支持作者

.gitee/ISSUE_TEMPLATE/feature.yaml

@@ -0,0 +1,13 @@
+name: 功能建议
+description: 对本项目提出一个功能建议
+title: "[功能建议]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢对项目的支持与关注。如果你在使用中有什么好的建议欢迎提出来
+  - type: textarea
+    attributes:
+      label: 请输入内容
+      description: 如果可以的话，上传任何关于 功能 的截图。

Infrastructure/Controllers/BaseController.cs

@@ -8,6 +8,7 @@ using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading.Tasks;
 using System.Web;
 
 namespace Infrastructure.Controllers
@@ -15,6 +16,7 @@ namespace Infrastructure.Controllers
     /// <summary>
     /// web层通用数据处理
     /// </summary>
+    //[ApiController]
     public class BaseController : ControllerBase
     {
         public static string TIME_FORMAT_FULL = "yyyy-MM-dd HH:mm:ss";
@@ -74,6 +76,23 @@ namespace Infrastructure.Controllers
             return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", HttpUtility.UrlEncode(fileName));
         }
 
+        /// <summary>
+        /// 下载文件
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="fileName">文件名，一定要带扩展名</param>
+        /// <returns></returns>
+        protected IActionResult DownFile(string path, string fileName)
+        {
+            if (!System.IO.File.Exists(path))
+            {
+                return NotFound();
+            }
+            var stream = System.IO.File.OpenRead(path);  //创建文件流
+            Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition");
+            return File(stream, "application/octet-stream", HttpUtility.UrlEncode(fileName));
+        }
+
         #region 方法
 
         /// <summary>

Infrastructure/GlobalConstant.cs

@@ -5,11 +5,6 @@
     /// </summary>
     public class GlobalConstant
     {
-        /// <summary>
-        /// 代码生成常量
-        /// </summary>
-        public static readonly string CodeGenDbConfig;
-
         /// <summary>
         /// 管理员权限
         /// </summary>

Infrastructure/Helper/FileUtil.cs

@@ -144,7 +144,7 @@ namespace Infrastructure
         /// 写文件
         /// </summary>
         /// <param name="path">完整路径带扩展名的</param>
-        /// <param name="content"></param>
+        /// <param name="content">写入文件内容</param>
         public static void WriteAndSave(string path, string content)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
@@ -158,17 +158,7 @@ namespace Infrastructure
             Console.WriteLine("开始写入文件，Path=" + path);
             try
             {
-                //实例化一个文件流--->与写入文件相关联
+                File.WriteAllText(path, content);
-                using var fs = new FileStream(path, FileMode.Create, FileAccess.Write);
-                //实例化一个StreamWriter-->与fs相关联
-                using var sw = new StreamWriter(fs);
-                //开始写入
-                sw.Write(content);
-                //清空缓冲区
-                sw.Flush();
-                //关闭流
-                sw.Close();
-                fs.Close();
             }
             catch (Exception ex)
             {

Infrastructure/Helper/RandomHelper.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+
+namespace ZR.Infrastructure.Helper
+{
+    public class RandomHelper
+    {
+        /// <summary>
+        /// 生成n为验证码
+        /// </summary>
+        /// <param name="Length"></param>
+        /// <returns></returns>
+        public static string GenerateNum(int Length)
+        {
+            char[] constant = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+            StringBuilder newRandom = new(constant.Length);
+            Random rd = new();
+            for (int i = 0; i < Length; i++)
+            {
+                newRandom.Append(constant[rd.Next(constant.Length - 1)]);
+            }
+            return newRandom.ToString();
+        }
+    }
+}

Infrastructure/JwtUtil.cs

@@ -155,9 +155,11 @@ namespace Infrastructure
         {
             var claims = new List<Claim>()
                 {
-                    new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()),
+                    new(ClaimTypes.PrimarySid, user.UserId.ToString()),
-                    new Claim(ClaimTypes.Name, user.UserName),
+                    new(ClaimTypes.NameIdentifier, user.UserId.ToString()),
-                    new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
+                    new(ClaimTypes.Name, user.UserName),
+                    new(ClaimTypes.GroupSid, user.DeptId.ToString()),
+                    new(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
                 };
 
             return claims;

Infrastructure/Model/ApiResult.cs

@@ -1,26 +1,24 @@
 using Infrastructure.Constant;
-using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace Infrastructure.Model
 {
     public class ApiResult : Dictionary<string, object>
     {
-        /** 状态码 */
+        /// <summary>
+        /// 状态码
+        /// </summary>
         public static readonly string CODE_TAG = "code";
 
-        /** 返回内容 */
+        /// <summary>
+        /// 返回内容
+        /// </summary>
         public static readonly string MSG_TAG = "msg";
 
-        /** 数据对象 */
-        public static readonly string DATA_TAG = "data";
-        //public int Code { get; set; }
-        //public string Msg { get; set; }
         /// <summary>
-        /// 如果data值为null，则忽略序列化将不会返回data字段
+        /// 数据对象
         /// </summary>
-        //[JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public static readonly string DATA_TAG = "data";
-        //public object Data { get; set; }
 
         /// <summary>
         /// 初始化一个新创建的APIResult对象，使其表示一个空消息
@@ -55,6 +53,7 @@ namespace Infrastructure.Model
                 Add(DATA_TAG, data);
             }
         }
+
         /// <summary>
         /// 返回成功消息
         /// </summary>
@@ -125,9 +124,4 @@ namespace Infrastructure.Model
             return this;
         }
     }
-
-    public class ApiResult<T> : ApiResult
-    {
-        public T Result { get; set; }
-    }
 }

Infrastructure/Model/OptionsSetting.cs

@@ -23,7 +23,7 @@ namespace Infrastructure.Model
         public Upload Upload { get; set; }
         public ALIYUN_OSS ALIYUN_OSS { get; set; }
         public JwtSettings JwtSettings { get; set; }
-        public Gen Gen { get; set; }
+        public CodeGen CodeGen { get; set; }
         public List<DbConfigs> DbConfigs { get; set; }
         public DbConfigs CodeGenDbConfig { get; set; }
     }
@@ -94,13 +94,15 @@ namespace Infrastructure.Model
         public string TokenType { get; set; } = "Bearer";
     }
 
-    public class Gen
+    public class CodeGen
     {
         public bool ShowApp { get; set; }
         public bool AutoPre { get; set; }
         public string VuePath { get; set; }
         public string Author { get; set; }
-        public DbConfigs GenDbConfig { get; set; }
+        public string TablePrefix { get; set; }
+        public string ModuleName { get; set; }
+        public int FrontTpl { get; set; }
         public CsharpTypeArr CsharpTypeArr { get; set; }
     }
 

Infrastructure/Model/SendEmailDto.cs

@@ -23,5 +23,9 @@ namespace Infrastructure.Model
         /// </summary>
         public bool SendMe { get; set; }
         public DateTime AddTime { get; set; }
+        /// <summary>
+        /// 是否发送
+        /// </summary>
+        public bool IsSend { get; set; }
     }
 }

Infrastructure/WebExtensions/EntityExtension.cs

@@ -19,6 +19,7 @@ namespace Infrastructure
             types.GetProperty("CreateBy", flag)?.SetValue(source, context.GetName(), null);
             types.GetProperty("Create_by", flag)?.SetValue(source, context.GetName(), null);
             types.GetProperty("UserId", flag)?.SetValue(source, context.GetUId(), null);
+            types.GetProperty("DeptId", flag)?.SetValue(source, context.GetDeptId(), null);
 
             return source;
         }

Infrastructure/WebExtensions/HttpContextExtension.cs

@@ -80,6 +80,17 @@ namespace Infrastructure.Extensions
             return !string.IsNullOrEmpty(uid) ? long.Parse(uid) : 0;
         }
 
+        /// <summary>
+        /// 获取部门id
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public static long GetDeptId(this HttpContext context)
+        {
+            var deptId = context.User.FindFirstValue(ClaimTypes.GroupSid);
+            return !string.IsNullOrEmpty(deptId) ? long.Parse(deptId) : 0;
+        }
+
         /// <summary>
         /// 获取登录用户名
         /// </summary>

Infrastructure/WebExtensions/RequestLimitExtension.cs

@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ZR.Infrastructure.WebExtensions
+{
+    public static class RequestLimitExtension
+    {
+        /// <summary>
+        /// 请求body大小设置
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="configuration"></param>
+        public static void AddRequestLimit(this IServiceCollection services, IConfiguration configuration)
+        {
+            var sizeM = configuration.GetSection("upload:requestLimitSize").Get<int>();
+            services.Configure<FormOptions>(x =>
+            {
+                x.MultipartBodyLengthLimit = sizeM * 1024 * 1024;
+                x.MemoryBufferThreshold = sizeM * 1024 * 1024;
+                x.ValueLengthLimit = int.MaxValue;
+            });
+            services.Configure<KestrelServerOptions>(options =>
+            {
+                options.Limits.MaxRequestBodySize = sizeM * 1024 * 1024;
+            });
+            services.Configure<IISServerOptions>(options =>
+            {
+                options.MaxRequestBodySize = sizeM * 1024 * 1024; // 设置最大请求体大小为500MB
+            });
+        }
+    }
+}

Infrastructure/ZR.Infrastructure.csproj

@@ -17,9 +17,9 @@
 		<PackageReference Include="UAParser" Version="3.1.47" />
 		<PackageReference Include="IPTools.China" Version="1.6.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" />
-		<PackageReference Include="JinianNet.JNTemplate" Version="2.3.3" />
+		<PackageReference Include="JinianNet.JNTemplate" Version="2.4.2" />
-		<PackageReference Include="MiniExcel" Version="1.31.2" />
+		<PackageReference Include="MiniExcel" Version="1.31.3" />
-		<PackageReference Include="CSRedisCore" Version="3.8.670" />
+		<PackageReference Include="CSRedisCore" Version="3.8.802" />
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
 	</ItemGroup>
 

README.en.md

@@ -1,12 +1,17 @@
 <h2 align="center"> ZR.Admin.NET Back-end management system</h2>
 <h4 align="center">base .Net7 + vue2.x/vue3.x/uniapp Front-end and back-end separation of .NET rapid development framework</h4>
 
-<p align="center">
+<div style="text-align:center">
-	<a href="https://gitee.com/izory/ZrAdminNetCore"><img src="https://gitee.com/izory/ZrAdminNetCore/badge/star.svg?theme=dark"></a>
+
-<a href='https://gitee.com/izory/ZrAdminNetCore/members'><img src='https://gitee.com/izory/ZrAdminNetCore/badge/fork.svg?theme=dark' alt='fork'></img></a>
+[![stars](https://gitee.com/izory/ZrAdminNetCore/badge/star.svg?theme=dark)](https://gitee.com/izory/ZrAdminNetCore)
-	<a href="https://gitee.com/izory/ZrAdminNetCore/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
+[![fork](https://gitee.com//izory/ZrAdminNetCore/badge/fork.svg?theme=dark)](https://gitee.com/izory/ZrAdminNetCore/members)
-	<a href="http://www.izhaorui.cn/doc/changelog.html"><img src="https://img.shields.io/badge/更新日志-20230920-yellow"/></a>
+[![Change log](https://img.shields.io/badge/ChangeLog-20240105-yellow)](http://www.izhaorui.cn/doc/changelog.html)
-</p>
+
+[![GitHub license](https://img.shields.io/github/license/izhaorui/ZrAdmin.NET)](https://github.com/izhaorui/ZrAdmin.NET/blob/main/LICENSE)
+[![GitHub stars](https://img.shields.io/github/stars/izhaorui/ZrAdmin.NET?style=social)](https://github.com/izhaorui/ZrAdmin.NET/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/izhaorui/ZrAdmin.NET?style=social)](https://github.com/izhaorui/ZrAdmin.NET/network)
+
+</div>
 
 ---
 
@@ -27,6 +32,10 @@
 If it helps you, you can click "Star" in the upper right corner to collect it, so that the author has the motivation to continue to go on for free, thank you! ~
 ```
 
+## 📈 Quick start
+
+- Quick start：[https://www.izhaorui.cn/doc/quickstart.html](https://www.izhaorui.cn/doc/quickstart.html)
+
 ## 🍿 Online experience
 
 - Official documentation：http://www.izhaorui.cn/doc
@@ -46,10 +55,10 @@ Since it is a personal project, the funds are limited, and the experience server
 
 ## 💒 Code repository
 
-| repository           | Github                                                 | Gitee                                                            |
+| repository | Github                                                      | Gitee                                                    |
-| -------------- | ------------------------------------------------------ | ---------------------------------------------------------------- |
+| ---------- | ----------------------------------------------------------- | -------------------------------------------------------- |
-| Net7           | [Clone/Download](https://github.com/izhaorui/Zr.Admin.NET)  | [Clone/Download](https://gitee.com/izory/ZrAdminNetCore) |
+| Net7       | [Clone/Download](https://github.com/izhaorui/Zr.Admin.NET)  | [Clone/Download](https://gitee.com/izory/ZrAdminNetCore) |
-| Vue3(Hot) | [Clone/Download](https://github.com/izhaorui/ZR.Admin.Vue3) | [Clone/Download](https://gitee.com/izory/ZRAdmin-vue)                 |
+| Vue3(Hot)  | [Clone/Download](https://github.com/izhaorui/ZR.Admin.Vue3) | [Clone/Download](https://gitee.com/izory/ZRAdmin-vue)    |
 
 ## 🍁 Front-end technology
 
@@ -149,9 +158,16 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router,
 		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/19.png"/></td>
 		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/20.png"/></td>
 	</tr>
+	<tr>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/21.png"/></td>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/22.png"/></td>
+	</tr>
+	<tr>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/23.png"/></td>
+	</tr>
 </table>
 
-## Mobile Storyplate
+## 📱 Mobile Storyplate
 
 <table>
     <tr>
@@ -170,8 +186,12 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router,
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a7.png"/></td>
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a9.png"/></td>
     </tr>
-<tr>
+		<tr>
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a10.png"/></td>
+				<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a11.png"/></td>
+    </tr>
+		<tr>
+        <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a12.png"/></td>
     </tr>
 
 </table>
@@ -192,6 +212,7 @@ Vue Front-end technology stack: Based on Vue2.x/Vue3.x/UniApp, Vue, Vue-router,
 - 👉SqlSugar：[SqlSugar](https://gitee.com/dotnetchina/SqlSugar)
 - 👉vue-element-admin：[vue-element-admin](https://github.com/PanJiaChen/vue-element-admin)
 - 👉Meiam.System：[Meiam.System](https://github.com/91270/Meiam.System)
+- 👉Furion：[Furion](https://gitee.com/dotnetchina/Furion)
 
 ## 🎀 donation
 

README.md

@@ -1,12 +1,24 @@
 <h2 align="center"> ZR.Admin.NET后台管理系统</h2>
 <h4 align="center">基于.Net7 + vue2.x/vue3.x/uniapp前后端分离的.net快速开发框架</h4>
 
-<p align="center">
+<!-- <p align="center">
 	<a href="https://gitee.com/izory/ZrAdminNetCore"><img src="https://gitee.com/izory/ZrAdminNetCore/badge/star.svg?theme=dark"></a>
 <a href='https://gitee.com/izory/ZrAdminNetCore/members'><img src='https://gitee.com/izory/ZrAdminNetCore/badge/fork.svg?theme=dark' alt='fork'></img></a>
 	<a href="https://gitee.com/izory/ZrAdminNetCore/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 	<a href="http://www.izhaorui.cn/doc/changelog.html"><img src="https://img.shields.io/badge/更新日志-20230920-yellow"/></a>
-</p>
+</p> -->
+
+<div style="text-align:center">
+
+[![stars](https://gitee.com/izory/ZrAdminNetCore/badge/star.svg?theme=dark)](https://gitee.com/izory/ZrAdminNetCore)
+[![fork](https://gitee.com//izory/ZrAdminNetCore/badge/fork.svg?theme=dark)](https://gitee.com/izory/ZrAdminNetCore/members)
+[![更新日志](https://img.shields.io/badge/更新日志-20240105-yellow)](http://www.izhaorui.cn/doc/changelog.html)
+
+[![GitHub license](https://img.shields.io/github/license/izhaorui/ZrAdmin.NET)](https://github.com/izhaorui/ZrAdmin.NET/blob/main/LICENSE)
+[![GitHub stars](https://img.shields.io/github/stars/izhaorui/ZrAdmin.NET?style=social)](https://github.com/izhaorui/ZrAdmin.NET/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/izhaorui/ZrAdmin.NET?style=social)](https://github.com/izhaorui/ZrAdmin.NET/network)
+
+</div>
 
 ---
 
@@ -31,13 +43,17 @@
 如果对您有帮助，您可以点右上角 “Star” 收藏一下 ，谢谢！~
 ```
 
+## 📈 快速开始
+
+- 快速开始：[https://www.izhaorui.cn/doc/quickstart.html](https://www.izhaorui.cn/doc/quickstart.html)
+
 ## 🍿 在线体验
 
 - 官方文档：http://www.izhaorui.cn/doc
 - 加入群聊：[立即加入](http://www.izhaorui.cn/doc/contact.html)
-- Vue3.x 版本体验：[http://www.izhaorui.cn/vue3](http://www.izhaorui.cn/vue3)
+- Vue3.x 版本体验：[http://demo.izhaorui.cn/vue3](http://demo.izhaorui.cn/vue3)
-- Vue2.x 版本体验：[http://www.izhaorui.cn/admin](http://www.izhaorui.cn/admin)
+- Vue2.x 版本体验：[http://demo.izhaorui.cn/admin](http://demo.izhaorui.cn/admin)
-- Uniapp 版本体验：[http://www.izhaorui.cn/h5](http://www.izhaorui.cn/h5)
+- Uniapp 版本体验：[http://demo.izhaorui.cn/h5](http://demo.izhaorui.cn/h5)
 - 账号密码：admin/123456，普通用户 user/123456
 
 | H5                                                                                     | 微信小程序                                                                           |
@@ -61,7 +77,7 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 
 ## 🍀 后端技术
 
-- 核心框架：.Net5.0/.Net7.0 + Web API + sqlsugar + swagger + signalR + IpRateLimit + Quartz.net + Redis
+- 核心框架：.Net7.0 + Web API + sqlsugar + swagger + signalR + IpRateLimit + Quartz.net + Redis
 - 定时计划任务：Quartz.Net 组件，支持执行程序集或者 http 网络请求
 - 安全支持：过滤器(数据权限过滤)、Sql 注入、请求伪造
 - 日志管理：NLog、登录日志、操作日志、定时任务日志
@@ -70,7 +86,7 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 - 代码生成：高效率开发，代码生成器可以一键生成所有前后端代码
 - 数据字典：支持数据字典，可以方便对一些状态进行管理
 - 分库分表：使用 orm sqlsugar 可以很轻松的实现分库分库性能优越
-- 多 租 户：支持多租户功能
+- 多 租 户：支持多租户功能(多数据库源)
 - 缓存数据：内置内存缓存和 Redis
 - signalR：使用 signalr 管理用户在线状态
 
@@ -87,7 +103,7 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 9. 系统接口：使用 swagger 生成相关 api 接口文档。
 10. 服务监控：监视当前系统 CPU、内存、磁盘、堆栈等相关信息。
 11. 在线构建器：拖动表单元素生成相应的 VUE 代码(仅支持 vue2)。
-12. 任务系统：基于 Quartz.NET，可以在线（添加、修改、删除、手动执行)任务调度包含执行结果日志。
+12. 任务系统：基于 Quartz.NET，可以在线（添加、修改、删除、手动执行）任务调度包含执行结果日志。
 13. 文章管理：可以写文章记录。
 14. 代码生成：可以一键生成前后端代码(.cs、.vue、.js、.sql、uniapp 等)支持下载，自定义配置前端展示控件、让开发更快捷高效（史上最强）。
 15. 参数管理：对系统动态配置常用参数。
@@ -99,6 +115,8 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 21. 在线用户：可以查看正在登录使用的用户，可以对其踢出、通知操作
 22. db 审计日志：数据库审计功能
 23. 三方登录：提供三方登录实现逻辑
+24. 导入导出：支持中文表头导入、字典数据转换成文本导出
+25. 数据大屏：更直观的展示数据
 
 ## 🍻 项目结构
 
@@ -161,10 +179,15 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 	</tr>
 	<tr>
 		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/21.png"/></td>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/22.png"/></td>
+	</tr>
+	<tr>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/23.png"/></td>
+		<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/24.png"/></td>
 	</tr>
 </table>
 
-## 移动端演示图
+## 📱 移动端演示图
 
 <table>
     <tr>
@@ -183,8 +206,12 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a7.png"/></td>
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a9.png"/></td>
     </tr>
-<tr>
+		<tr>
         <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a10.png"/></td>
+				<td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a11.png"/></td>
+    </tr>
+		<tr>
+        <td><img src="https://gitee.com/izory/ZrAdminNetCore/raw/master/document/images/a12.png"/></td>
     </tr>
 
 </table>
@@ -196,9 +223,8 @@ Vue 版前端技术栈 ：基于 vue2.x/vue3.x/uniapp、vuex、vue-router 、vue
 3. 前台与后台系统分离，分别为不同的系统（域名可独立）
 4. 全局异常统一处理
 5. 自定义的代码生成功能
-6. 依赖少，上手容易
+6. 依赖少(只需数据库即可使用)，上手容易
 7. 文档全面
-8. 支持中文表头导入数据
 
 ## 💐 特别鸣谢
 

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

@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.Dto;
 using ZR.Model.System;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers
 {

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

@@ -1,10 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -33,7 +32,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("list")]
-        [ActionPermissionFilter(RolePermi = "admin")]
+        [ActionPermissionFilter(Permission = "system:article:list")]
         public IActionResult Query([FromQuery] ArticleQueryDto parm)
         {
             var response = _ArticleService.GetList(parm);
@@ -86,6 +85,7 @@ namespace ZR.Admin.WebApi.Controllers
             long userId = HttpContext.GetUId();
             var response = _ArticleService.GetId(id);
             var model = response.Adapt<ArticleDto>();
+            if (model == null) return ToResponse(ResultCode.FAIL, "文章不存在");
             if (model.IsPublic == 0 && userId != model.UserId)
             {
                 return ToResponse(ResultCode.CUSTOM_ERROR, "访问失败");

ZR.Admin.WebApi/Controllers/CommonController.cs

@@ -1,11 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Service.IService;
-using ZR.Service.System;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -75,39 +72,6 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(msg);
         }
 
-        /// <summary>
-        /// 发送邮件
-        /// </summary>
-        /// <param name="sendEmailVo">请求参数接收实体</param>
-        /// <returns></returns>
-        [ActionPermissionFilter(Permission = "tool:email:send")]
-        [Log(Title = "发送邮件")]
-        [HttpPost]
-        public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo)
-        {
-            if (sendEmailVo == null)
-            {
-                return ToResponse(ApiResult.Error($"请求参数不完整"));
-            }
-            if (string.IsNullOrEmpty(OptionsSetting.MailOptions.FromEmail) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password))
-            {
-                return ToResponse(ApiResult.Error($"请配置邮箱信息"));
-            }
-
-            MailHelper mailHelper = new();
-
-            string[] toUsers = sendEmailVo.ToUser.Split(",", StringSplitOptions.RemoveEmptyEntries);
-            if (sendEmailVo.SendMe)
-            {
-                toUsers.Append(mailHelper.FromEmail);
-            }
-            string result = mailHelper.SendMail(toUsers, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent);
-
-            logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}, 结果{result}");
-
-            return SUCCESS(result);
-        }
-
         #region 上传
 
         /// <summary>
@@ -187,6 +151,36 @@ namespace ZR.Admin.WebApi.Controllers
 
         #endregion
 
+        /// <summary>
+        /// 下载文件
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="fileId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Verify]
+        [ActionPermissionFilter(Permission = "common")]
+        [Log(Title = "下载文件", IsSaveResponseData = false)]
+        public IActionResult DownloadFile(string? path, long fileId = 0)
+        {
+            var tempPath = path;
+            if (fileId > 0)
+            {
+                var fileInfo = SysFileService.GetById(fileId);
+                if (fileInfo != null)
+                {
+                    tempPath = fileInfo.FileUrl;
+                }
+            }
+            string fullPath = tempPath;
+            if (tempPath.StartsWith("/"))
+            {
+                fullPath = Path.Combine(WebHostEnvironment.WebRootPath, tempPath.ReplaceFirst("/", ""));
+            }
+            string fileName = Path.GetFileName(fullPath);
+            return DownFile(fullPath, fileName);
+        }
+
         /// <summary>
         /// 初始化种子数据
         /// </summary>

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

@@ -0,0 +1,142 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Services;
+
+//创建时间：2023-11-20
+namespace ZR.Admin.WebApi.Controllers.Email
+{
+    /// <summary>
+    /// 邮件发送记录
+    /// </summary>
+    [Verify]
+    [Route("system/EmailLog")]
+    [ApiExplorerSettings(GroupName = "sys")]
+    public class EmailLogController : BaseController
+    {
+        /// <summary>
+        /// 邮件发送记录接口
+        /// </summary>
+        private readonly IEmailLogService _EmailLogService;
+        private OptionsSetting OptionsSetting;
+        public EmailLogController(
+            IEmailLogService EmailLogService,
+            IOptions<OptionsSetting> options)
+        {
+            _EmailLogService = EmailLogService;
+            OptionsSetting = options.Value;
+        }
+
+        /// <summary>
+        /// 查询邮件发送记录列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "emaillog:list")]
+        public IActionResult QueryEmailLog([FromQuery] EmailLogQueryDto parm)
+        {
+            var response = _EmailLogService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询邮件发送记录详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "emaillog:query")]
+        public IActionResult GetEmailLog(long Id)
+        {
+            var response = _EmailLogService.GetInfo(Id);
+
+            var info = response.Adapt<EmailLogDto>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加邮件发送记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("sendEmail")]
+        [ActionPermissionFilter(Permission = "tool:email:send")]
+        [Log(Title = "邮件发送", BusinessType = BusinessType.INSERT)]
+        public IActionResult SendEmail([FromBody] EmailLogDto dto)
+        {
+            if (dto.IdArr.Length <= 0) { return ToResponse(ApiResult.Error($"发送失败Id 不能为空")); }
+            int count = 0;
+            foreach (var item in dto.IdArr)
+            {
+                var response = _EmailLogService.GetInfo(item);
+                if (response?.IsSend == 0)
+                {
+                    MailHelper mailHelper = new();
+                    string[] toUsers = response.ToEmails.Split(",", StringSplitOptions.RemoveEmptyEntries);
+
+                    string result = mailHelper.SendMail(toUsers, response.Subject, "", response.FileUrl, response.EmailContent);
+                    count += _EmailLogService.Update(x => x.Id == item, x => new EmailLog()
+                    {
+                        IsSend = 1,
+                        SendTime = DateTime.Now,
+                        SendResult = result
+                    });
+                }
+            }
+            return SUCCESS(count);
+        }
+
+        /// <summary>
+        /// 删除邮件发送记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "emaillog:delete")]
+        [Log(Title = "邮件发送记录", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteEmailLog(string ids)
+        {
+            long[] idsArr = Tools.SpitLongArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _EmailLogService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 发送邮件
+        /// </summary>
+        /// <param name="sendEmailVo">请求参数接收实体</param>
+        /// <returns></returns>
+        [ActionPermissionFilter(Permission = "tool:email:send")]
+        [Log(Title = "发送邮件")]
+        [HttpPost("/common/SendEmail")]
+        public IActionResult SendEmail([FromBody] SendEmailDto sendEmailVo)
+        {
+            if (sendEmailVo == null)
+            {
+                return ToResponse(ApiResult.Error($"请求参数不完整"));
+            }
+            if (string.IsNullOrEmpty(OptionsSetting.MailOptions.FromEmail) || string.IsNullOrEmpty(OptionsSetting.MailOptions.Password))
+            {
+                return ToResponse(ApiResult.Error($"请配置邮箱信息"));
+            }
+
+            MailHelper mailHelper = new();
+
+            string[] toUsers = sendEmailVo.ToUser.Split(",", StringSplitOptions.RemoveEmptyEntries);
+            string result = string.Empty;
+            if (sendEmailVo.IsSend)
+            {
+                result = mailHelper.SendMail(toUsers, sendEmailVo.Subject, sendEmailVo.Content, sendEmailVo.FileUrl, sendEmailVo.HtmlContent);
+            }
+            _EmailLogService.AddEmailLog(new EmailLog() { EmailContent = sendEmailVo.HtmlContent, Subject = sendEmailVo.Subject, ToEmails = sendEmailVo.ToUser, AddTime = DateTime.Now, FromEmail = OptionsSetting.MailOptions.FromEmail, IsSend = sendEmailVo.IsSend ? 1 : 0, SendResult = result });
+            //logger.Info($"发送邮件{JsonConvert.SerializeObject(sendEmailVo)}, 结果{result}");
+
+            return SUCCESS(result);
+        }
+
+    }
+}

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

@@ -0,0 +1,102 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.Dto;
+using ZR.ServiceCore.Model;
+
+//创建时间：2023-11-12
+namespace ZR.Admin.WebApi.Controllers.Email
+{
+    /// <summary>
+    /// 邮件模板
+    /// </summary>
+    [Verify]
+    [Route("system/EmailTpl")]
+    [ApiExplorerSettings(GroupName = "sys")]
+    public class EmailTplController : BaseController
+    {
+        /// <summary>
+        /// 邮件模板接口
+        /// </summary>
+        private readonly IEmailTplService _EmailTplService;
+
+        public EmailTplController(IEmailTplService EmailTplService)
+        {
+            _EmailTplService = EmailTplService;
+        }
+
+        /// <summary>
+        /// 查询邮件模板列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "tool:emailtpl:list")]
+        public IActionResult QueryEmailTpl([FromQuery] EmailTplQueryDto parm)
+        {
+            var response = _EmailTplService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询邮件模板详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        public IActionResult GetEmailTpl(int Id)
+        {
+            var response = _EmailTplService.GetInfo(Id);
+
+            var info = response.Adapt<EmailTpl>();
+            return SUCCESS(info);
+        }
+
+        /// <summary>
+        /// 添加邮件模板
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "tool:emailtpl:add")]
+        [Log(Title = "邮件模板", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddEmailTpl([FromBody] EmailTplDto parm)
+        {
+            var modal = parm.Adapt<EmailTpl>().ToCreate(HttpContext);
+
+            var response = _EmailTplService.AddEmailTpl(modal);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 更新邮件模板
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "tool:emailtpl:edit")]
+        [Log(Title = "邮件模板", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateEmailTpl([FromBody] EmailTplDto parm)
+        {
+            var modal = parm.Adapt<EmailTpl>().ToUpdate(HttpContext);
+            var response = _EmailTplService.UpdateEmailTpl(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除邮件模板
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "tool:emailtpl:delete")]
+        [Log(Title = "邮件模板", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteEmailTpl(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _EmailTplService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.CodeGenerator;
 using ZR.CodeGenerator.Model;
@@ -8,7 +8,6 @@ using ZR.CodeGenerator.Service;
 using ZR.Model;
 using ZR.Model.System.Dto;
 using ZR.Model.System.Generate;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -25,16 +24,20 @@ namespace ZR.Admin.WebApi.Controllers
         private readonly IGenTableColumnService GenTableColumnService;
         private readonly ISysMenuService SysMenuService;
         private readonly IWebHostEnvironment WebHostEnvironment;
+        private readonly OptionsSetting OptionsSetting;
+
         public CodeGeneratorController(
             IGenTableService genTableService,
             IGenTableColumnService genTableColumnService,
             IWebHostEnvironment webHostEnvironment,
+            IOptions<OptionsSetting> options,
             ISysMenuService sysMenuService)
         {
             GenTableService = genTableService;
             GenTableColumnService = genTableColumnService;
             WebHostEnvironment = webHostEnvironment;
             SysMenuService = sysMenuService;
+            OptionsSetting = options.Value;
         }
 
         /// <summary>
@@ -134,43 +137,47 @@ namespace ZR.Admin.WebApi.Controllers
         /// <summary>
         /// 导入表结构（保存）
         /// </summary>
-        /// <param name="tables"></param>
+        /// <param name="dto"></param>
-        /// <param name="dbName"></param>
         /// <returns></returns>
         [HttpPost("importTable")]
         [Log(Title = "代码生成", BusinessType = BusinessType.IMPORT)]
         [ActionPermissionFilter(Permission = "tool:gen:import")]
-        public IActionResult ImportTableSave(string tables, string dbName)
+        public IActionResult ImportTableSave([FromBody] ImportCodeGenTableDto dto)
         {
-            if (string.IsNullOrEmpty(tables))
+            if (string.IsNullOrEmpty(dto.DbName) || dto.Tables == null)
             {
-                throw new CustomException("表不能为空");
+                throw new CustomException("表或数据库不能为空");
             }
-            DbConfigs dbConfig = AppSettings.Get<DbConfigs>(nameof(GlobalConstant.CodeGenDbConfig));
+
-            string[] tableNames = tables.Split(',', StringSplitOptions.RemoveEmptyEntries);
             int result = 0;
-            foreach (var tableName in tableNames)
+            foreach (var table in dto.Tables)
             {
-                var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName);
+                List<OracleSeq> seqs = new();
-                if (tabInfo != null)
+                InitTableDto initTableDto = new()
                 {
-                    List<OracleSeq> seqs = new();
+                    DbName = dto.DbName,
-                    GenTable genTable = CodeGeneratorTool.InitTable(dbName, HttpContext.GetName(), tableName, tabInfo?.Description);
+                    UserName = HttpContext.GetName(),
-                    genTable.TableId = GenTableService.ImportGenTable(genTable);
+                    TableName = table.Name,
-                    if (dbConfig.DbType == 3)
+                    Desc = table.Description,
-                    {
+                    CodeGen = OptionsSetting.CodeGen,
-                        seqs = _CodeGeneraterService.GetAllOracleSeqs(dbName);
+                    FrontTpl = dto.FrontTpl,
-                    }
+                };
-                    if (genTable.TableId > 0)
+
-                    {
+                GenTable genTable = CodeGeneratorTool.InitTable(initTableDto);
-                        //保存列信息
+                genTable.TableId = GenTableService.ImportGenTable(genTable);
-                        List<DbColumnInfo> dbColumnInfos = _CodeGeneraterService.GetColumnInfo(dbName, tableName);
+                if (OptionsSetting.CodeGenDbConfig.DbType == 3)
-                        List<GenTableColumn> genTableColumns = CodeGeneratorTool.InitGenTableColumn(genTable, dbColumnInfos, seqs);
+                {
-                        GenTableColumnService.DeleteGenTableColumnByTableName(tableName);
+                    seqs = _CodeGeneraterService.GetAllOracleSeqs(table.Name);
-                        GenTableColumnService.InsertGenTableColumn(genTableColumns);
+                }
-                        genTable.Columns = genTableColumns;
+                if (genTable.TableId > 0)
-                        result++;
+                {
-                    }
+                    //保存列信息
+                    List<DbColumnInfo> dbColumnInfos = _CodeGeneraterService.GetColumnInfo(dto.DbName, table.Name);
+                    List<GenTableColumn> genTableColumns = CodeGeneratorTool.InitGenTableColumn(genTable, dbColumnInfos, seqs, OptionsSetting.CodeGen);
+                    GenTableColumnService.DeleteGenTableColumnByTableName(table.Name);
+                    GenTableColumnService.InsertGenTableColumn(genTableColumns);
+                    genTable.Columns = genTableColumns;
+                    result++;
                 }
             }
 
@@ -195,7 +202,7 @@ namespace ZR.Admin.WebApi.Controllers
             var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
 
             //将前端额外参数转成字符串存入Options中
-            genTable.Options = genTableDto.Params.Adapt<Options>();
+            genTable.Options = genTableDto.Params.Adapt<CodeOptions>();
             DbResult<bool> result = GenTableService.UseTran(() =>
             {
                 int rows = GenTableService.UpdateGenTable(genTable);
@@ -224,9 +231,8 @@ namespace ZR.Admin.WebApi.Controllers
                 throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空");
             }
             var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId);
-            var dbConfig = AppSettings.Get<DbConfigs>(nameof(GlobalConstant.CodeGenDbConfig));
 
-            dto.DbType = dbConfig.DbType;
+            dto.DbType = OptionsSetting.CodeGenDbConfig.DbType;
             dto.GenTable = genTableInfo;
             dto.IsPreview = true;
 
@@ -249,44 +255,53 @@ namespace ZR.Admin.WebApi.Controllers
             {
                 throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空");
             }
-            var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId);
-            var dbConfig = AppSettings.Get<DbConfigs>(nameof(GlobalConstant.CodeGenDbConfig));
 
-            dto.DbType = dbConfig.DbType;
+            dto.DbType = OptionsSetting.CodeGenDbConfig.DbType;
-            dto.GenTable = genTableInfo;
+            dto.GenTable = GenTableService.GetGenTableInfo(dto.TableId);
-            //自定义路径
+            //生成压缩包
-            if (genTableInfo.GenType == "1")
+            string zipReturnFileName = $"ZrAdmin.NET-{dto.GenTable.TableName}-{DateTime.Now:MMddHHmmss}.zip";
+
+            //生成代码到指定文件夹
+            CodeGeneratorTool.Generate(dto);
+            if (dto.GenTable.Options.GenerateMenu)
             {
-                var genPath = genTableInfo.GenPath;
+                SysMenuService.AddSysMenu(dto.GenTable, dto.ReplaceDto.PermissionPrefix, dto.ReplaceDto.ShowBtnEdit, dto.ReplaceDto.ShowBtnExport, dto.ReplaceDto.ShowBtnImport);
+            }
+            if (dto.GenTable.GenType == "1")//自定义路径
+            {
+                var genPath = dto.GenTable.GenPath;
+                string parentPath;
                 string tempPath = WebHostEnvironment.ContentRootPath;
-                var parentPath = tempPath[..tempPath.LastIndexOf(@"\")];
+
+                if (ComputerHelper.IsUnix())
+                {
+                    parentPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode");
+                }
+                else
+                {
+                    parentPath = tempPath[..tempPath.LastIndexOf(@"\")];
+                }
+                Console.WriteLine("代码生成路径" + parentPath);
                 //代码生成文件夹路径
-                dto.GenCodePath = (genPath.IsEmpty() || genPath.Equals("/")) ? parentPath : genTableInfo.GenPath;
+                dto.GenCodePath = (genPath.IsEmpty() || genPath.Equals("/")) ? parentPath : genPath;
             }
             else
             {
                 dto.ZipPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode");
                 dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd"));
             }
-            //生成压缩包
-            string zipReturnFileName = $"ZrAdmin.NET-{genTableInfo.TableComment}-{DateTime.Now:MMddHHmmss}.zip";
-
-            //生成代码到指定文件夹
-            CodeGeneratorTool.Generate(dto);
-            if (genTableInfo.Options.GenerateMenu)
-            {
-                SysMenuService.AddSysMenu(genTableInfo, dto.ReplaceDto.PermissionPrefix, dto.ReplaceDto.ShowBtnEdit, dto.ReplaceDto.ShowBtnExport, dto.ReplaceDto.ShowBtnImport);
-            }
 
+            //写入文件
             foreach (var item in dto.GenCodes)
             {
                 item.Path = Path.Combine(dto.GenCodePath, item.Path);
                 FileUtil.WriteAndSave(item.Path, item.Content);
             }
-
+            if (dto.GenTable.GenType != "1")
-            //下载文件
+            {
-            FileUtil.ZipGenCode(dto.ZipPath, dto.GenCodePath, zipReturnFileName);
+                //压缩文件
-
+                FileUtil.ZipGenCode(dto.ZipPath, dto.GenCodePath, zipReturnFileName);
+            }
             return SUCCESS(new { path = "/Generatecode/" + zipReturnFileName, fileName = dto.ZipFileName });
         }
 
@@ -306,8 +321,9 @@ namespace ZR.Admin.WebApi.Controllers
             if (table == null) { throw new CustomException("同步数据失败，原表结构不存在"); }
             table.Update_by = HttpContext.GetName();
 
+            var codeGen = AppSettings.Get<CodeGen>("codeGen");
             List<DbColumnInfo> dbColumnInfos = _CodeGeneraterService.GetColumnInfo(table.DbName, tableName);
-            List<GenTableColumn> dbTableColumns = CodeGeneratorTool.InitGenTableColumn(table, dbColumnInfos);
+            List<GenTableColumn> dbTableColumns = CodeGeneratorTool.InitGenTableColumn(table, dbColumnInfos, codeGen: codeGen);
 
             bool result = GenTableService.SynchDb(tableId, table, dbTableColumns);
             return SUCCESS(result);

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

@@ -1,11 +1,9 @@
-using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.Dto;
 using ZR.Model.Models;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {

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

@@ -1,11 +1,8 @@
-using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {

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

@@ -3,7 +3,6 @@ using System.Collections;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -3,7 +3,6 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -3,7 +3,6 @@ using SqlSugar;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {

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

@@ -1,11 +1,10 @@
 using Lazy.Captcha.Core;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using ZR.Admin.WebApi.Filters;
+using ZR.Infrastructure.Helper;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System;
+using ZR.ServiceCore.Model.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -15,8 +14,6 @@ namespace ZR.Admin.WebApi.Controllers.System
     [ApiExplorerSettings(GroupName = "sys")]
     public class SysLoginController : BaseController
     {
-        //static readonly NLog.Logger logger = NLog.LogManager.GetLogger("LoginController");
-        private readonly IHttpContextAccessor httpContextAccessor;
         private readonly ISysUserService sysUserService;
         private readonly ISysMenuService sysMenuService;
         private readonly ISysLoginService sysLoginService;
@@ -24,28 +21,26 @@ namespace ZR.Admin.WebApi.Controllers.System
         private readonly ICaptcha SecurityCodeHelper;
         private readonly ISysConfigService sysConfigService;
         private readonly ISysRoleService roleService;
-        private readonly OptionsSetting optionSettings;
+        private readonly ISmsCodeLogService smsCodeLogService;
 
         public SysLoginController(
-            IHttpContextAccessor contextAccessor,
             ISysMenuService sysMenuService,
             ISysUserService sysUserService,
             ISysLoginService sysLoginService,
             ISysPermissionService permissionService,
             ISysConfigService configService,
             ISysRoleService sysRoleService,
-            ICaptcha captcha,
+            ISmsCodeLogService smsCodeLogService,
-            IOptions<OptionsSetting> optionSettings)
+            ICaptcha captcha)
         {
-            httpContextAccessor = contextAccessor;
             SecurityCodeHelper = captcha;
             this.sysMenuService = sysMenuService;
             this.sysUserService = sysUserService;
             this.sysLoginService = sysLoginService;
             this.permissionService = permissionService;
             this.sysConfigService = configService;
+            this.smsCodeLogService = smsCodeLogService;
             roleService = sysRoleService;
-            this.optionSettings = optionSettings.Value;
         }
 
 
@@ -172,7 +167,7 @@ namespace ZR.Admin.WebApi.Controllers.System
             {
                 return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误");
             }
-
+            dto.UserIP = HttpContext.GetClientUserIp();
             SysUser user = sysUserService.Register(dto);
             if (user.UserId > 0)
             {
@@ -261,5 +256,73 @@ namespace ZR.Admin.WebApi.Controllers.System
         }
         #endregion
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost("checkMobile")]
+        [Log(Title = "发送短息", BusinessType = BusinessType.INSERT)]
+        public IActionResult CheckMobile([FromBody] PhoneLoginDto dto)
+        {
+            dto.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
+
+            SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
+            if (sysConfig?.ConfigValue != "off" && !SecurityCodeHelper.Validate(dto.Uuid, dto.Code, false))
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "验证码错误");
+            }
+            string location = HttpContextExtension.GetIpInfo(dto.LoginIP);
+            var info = sysUserService.GetFirst(f => f.Phonenumber == dto.PhoneNum) ?? throw new CustomException(ResultCode.CUSTOM_ERROR, "该手机号不存在", false);
+
+            var smsCode = RandomHelper.GenerateNum(6);
+            var smsContent = $"验证码{smsCode}（随机验证码）,有效期10分钟。";
+            //TODO 发送短息验证码,1分钟内允许一次
+            smsCodeLogService.AddSmscodeLog(new ServiceCore.Model.SmsCodeLog()
+            {
+                Userid = info.UserId,
+                PhoneNum = dto.PhoneNum.ParseToLong(),
+                AddTime = DateTime.Now,
+                SendType = 1,
+                SmsCode = smsCode,
+                SmsContent = smsContent,
+                UserIP = dto.LoginIP,
+                Location = location,
+            });
+            CacheService.SetPhoneCode(dto.PhoneNum, smsCode);
+
+            return SUCCESS(new { smsCode });
+        }
+
+        /// <summary>
+        /// 手机号登录
+        /// </summary>
+        /// <param name="loginBody">登录对象</param>
+        /// <returns></returns>
+        [Route("PhoneLogin")]
+        [HttpPost]
+        [Log(Title = "手机号登录")]
+        public IActionResult PhoneLogin([FromBody] PhoneLoginDto loginBody)
+        {
+            if (loginBody == null) { throw new CustomException("请求参数错误"); }
+            loginBody.LoginIP = HttpContextExtension.GetClientUserIp(HttpContext);
+
+            if (!CacheService.CheckPhoneCode(loginBody.PhoneNum, loginBody.PhoneCode))
+            {
+                return ToResponse(ResultCode.CUSTOM_ERROR, "短信验证码错误");
+            }
+            var info = sysUserService.GetFirst(f => f.Phonenumber == loginBody.PhoneNum) ?? throw new CustomException(ResultCode.CUSTOM_ERROR, "该手机号不存在", false);
+            sysLoginService.CheckLockUser(info.UserName);
+            string location = HttpContextExtension.GetIpInfo(loginBody.LoginIP);
+            var user = sysLoginService.PhoneLogin(loginBody, new SysLogininfor() { LoginLocation = location }, info);
+
+            List<SysRole> roles = roleService.SelectUserRoleListByUserId(user.UserId);
+            //权限集合 eg *:*:*,system:user:list
+            List<string> permissions = permissionService.GetMenuPermission(user);
+
+            TokenModel loginUser = new(user.Adapt<TokenModel>(), roles.Adapt<List<Roles>>());
+            CacheService.SetUserPerms(GlobalConstant.UserPermKEY + user.UserId, permissions);
+            return SUCCESS(JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser)));
+        }
     }
 }

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

@@ -2,7 +2,7 @@
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -28,16 +28,28 @@ namespace ZR.Admin.WebApi.Controllers.System
             this.sysRoleMenuService = sysRoleMenuService;
         }
 
+        /// <summary>
+        /// 获取菜单树列表
+        /// </summary>
+        /// <returns></returns>
+        [ActionPermissionFilter(Permission = "system:menu:list")]
+        [HttpGet("treelist")]
+        public IActionResult TreeMenuList([FromQuery] MenuQueryDto menu)
+        {
+            long userId = HttpContext.GetUId();
+            return SUCCESS(sysMenuService.SelectTreeMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
+        }
+
         /// <summary>
         /// 获取菜单列表
         /// </summary>
         /// <returns></returns>
         [ActionPermissionFilter(Permission = "system:menu:list")]
         [HttpGet("list")]
-        public IActionResult TreeMenuList([FromQuery] MenuQueryDto menu)
+        public IActionResult MenuList([FromQuery] MenuQueryDto menu)
         {
             long userId = HttpContext.GetUId();
-            return SUCCESS(sysMenuService.SelectTreeMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
+            return SUCCESS(sysMenuService.SelectMenuList(menu, userId), "yyyy-MM-dd HH:mm:ss");
         }
 
         /// <summary>

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

@@ -5,7 +5,6 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 using ZR.ServiceCore.Signalr;
 
 namespace ZR.Admin.WebApi.Controllers.System

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

@@ -3,7 +3,7 @@ using SqlSugar;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -3,7 +3,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -168,7 +168,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "角色导出")]
         [HttpGet("export")]
-        //[ActionPermissionFilter(Permission = "system:role:export")]
+        [ActionPermissionFilter(Permission = "system:role:export")]
         public IActionResult Export()
         {
             var list = sysRoleService.SelectRoleAll();
@@ -184,7 +184,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <returns></returns>
         [Log(BusinessType = BusinessType.EXPORT, IsSaveResponseData = false, Title = "角色菜单导出")]
         [HttpGet("exportRoleMenu")]
-        [AllowAnonymous]
+        [ActionPermissionFilter(Permission = "system:role:export")]
         public IActionResult ExportRoleMenu(int roleId)
         {
             MenuQueryDto dto = new() { Status = "0", MenuTypeIds = "M,C,F" };

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

@@ -5,7 +5,6 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -79,21 +78,20 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <summary>
         /// 添加用户
         /// </summary>
-        /// <param name="user"></param>
+        /// <param name="parm"></param>
         /// <returns></returns>
-        [HttpPost("edit")]
+        [HttpPost("add")]
         [Log(Title = "用户管理", BusinessType = BusinessType.INSERT)]
         [ActionPermissionFilter(Permission = "system:user:add")]
-        public IActionResult AddUser([FromBody] SysUser user)
+        public IActionResult AddUser([FromBody] SysUserDto parm)
         {
+            var user = parm.Adapt<SysUser>().ToCreate(HttpContext);
             if (user == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
             if (UserConstants.NOT_UNIQUE.Equals(UserService.CheckUserNameUnique(user.UserName)))
             {
                 return ToResponse(ApiResult.Error($"新增用户 '{user.UserName}'失败，登录账号已存在"));
             }
 
-            user.Create_by = HttpContext.GetName();
-            user.Create_time = DateTime.Now;
             user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password);
 
             return SUCCESS(UserService.InsertUser(user));
@@ -102,16 +100,16 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <summary>
         /// 修改用户
         /// </summary>
-        /// <param name="user"></param>
+        /// <param name="parm"></param>
         /// <returns></returns>
         [HttpPut("edit")]
         [Log(Title = "用户管理", BusinessType = BusinessType.UPDATE)]
         [ActionPermissionFilter(Permission = "system:user:edit")]
-        public IActionResult UpdateUser([FromBody] SysUser user)
+        public IActionResult UpdateUser([FromBody] SysUserDto parm)
         {
+            var user = parm.Adapt<SysUser>().ToUpdate(HttpContext);
             if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
 
-            user.Update_by = HttpContext.GetName();
             int upResult = UserService.UpdateUser(user);
 
             return ToResponse(upResult);

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

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -4,7 +4,7 @@ using SqlSugar;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 using ZR.Tasks;
 
 namespace ZR.Admin.WebApi.Controllers

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

@@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.System
 {

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

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using ZR.Admin.WebApi.Filters;
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {
@@ -10,6 +11,7 @@ namespace ZR.Admin.WebApi.Controllers.monitor
     /// 系统监控
     /// </summary>
     [ApiExplorerSettings(GroupName = "sys")]
+    [Verify]
     public class MonitorController : BaseController
     {
         private OptionsSetting Options;

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

@@ -0,0 +1,77 @@
+using Microsoft.AspNetCore.Mvc;
+using ZR.Admin.WebApi.Filters;
+using ZR.Model.Dto;
+using ZR.ServiceCore.Services;
+
+//创建时间：2023-11-19
+namespace ZR.Admin.WebApi.Controllers.System.monitor
+{
+    /// <summary>
+    /// 短信验证码记录
+    /// </summary>
+    [Verify]
+    [Route("system/SmscodeLog")]
+    [ApiExplorerSettings(GroupName = "sys")]
+    public class SmsCodeLogController : BaseController
+    {
+        /// <summary>
+        /// 短信验证码记录接口
+        /// </summary>
+        private readonly ISmsCodeLogService _SmscodeLogService;
+
+        public SmsCodeLogController(ISmsCodeLogService SmscodeLogService)
+        {
+            _SmscodeLogService = SmscodeLogService;
+        }
+
+        /// <summary>
+        /// 查询短信验证码记录列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "smscodelog:list")]
+        public IActionResult QuerySmscodeLog([FromQuery] SmscodeLogQueryDto parm)
+        {
+            var response = _SmscodeLogService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 删除短信验证码记录
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "smscodelog:delete")]
+        [Log(Title = "短信验证码记录", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteSmscodeLog(string ids)
+        {
+            long[] idsArr = Tools.SpitLongArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _SmscodeLogService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 导出短信验证码记录
+        /// </summary>
+        /// <returns></returns>
+        [Log(Title = "短信验证码记录", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)]
+        [HttpGet("export")]
+        [ActionPermissionFilter(Permission = "smscodelog:export")]
+        public IActionResult Export([FromQuery] SmscodeLogQueryDto parm)
+        {
+            parm.PageNum = 1;
+            parm.PageSize = 100000;
+            var list = _SmscodeLogService.GetList(parm).Result;
+            if (list == null || list.Count <= 0)
+            {
+                return ToResponse(ResultCode.FAIL, "没有要导出的数据");
+            }
+            var result = ExportExcelMini(list, "短信验证码记录", "短信验证码记录");
+            return ExportExcel(result.Item2, result.Item1);
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 //创建时间：2023-08-17
 namespace ZR.Admin.WebApi.Controllers

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

@@ -4,7 +4,7 @@ using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {

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

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Model.System.Dto;
-using ZR.Service.System.IService;
+
 
 namespace ZR.Admin.WebApi.Controllers.monitor
 {
@@ -15,12 +14,10 @@ namespace ZR.Admin.WebApi.Controllers.monitor
     public class SysOperlogController : BaseController
     {
         private ISysOperLogService sysOperLogService;
-        private IWebHostEnvironment WebHostEnvironment;
 
-        public SysOperlogController(ISysOperLogService sysOperLogService, IWebHostEnvironment hostEnvironment)
+        public SysOperlogController(ISysOperLogService sysOperLogService)
         {
             this.sysOperLogService = sysOperLogService;
-            WebHostEnvironment = hostEnvironment;
         }
 
         /// <summary>

ZR.Admin.WebApi/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 #创建 /app文件夹
 WORKDIR /app
 #创建挂载目录,用于将程序部署在服务器本地

ZR.Admin.WebApi/Extensions/TasksExtension.cs

@@ -1,4 +1,5 @@
 using Quartz.Spi;
+using SqlSugar;
 using SqlSugar.IOC;
 using ZR.Model.System;
 using ZR.Tasks;
@@ -49,5 +50,29 @@ namespace ZR.Admin.WebApi.Extensions
             return app;
         }
 
+        /// <summary>
+        /// 初始化字典
+        /// </summary>
+        /// <param name="app"></param>
+        /// <returns></returns>
+        public static IApplicationBuilder UseInit(this IApplicationBuilder app)
+        {
+            Console.WriteLine("初始化字典数据...");
+            var db = DbScoped.SugarScope;
+            var types = db.Queryable<SysDictType>()
+                .Where(it => it.Status == "0")
+                .Select(it => it.DictType)
+                .ToList();
+
+            //上面有耗时操作写在Any上面，保证程序启动后只执行一次
+            if (!db.ConfigQuery.Any())
+            {
+                foreach (var type in types)
+                {
+                    db.ConfigQuery.SetTable<SysDictData>(it => SqlFunc.ToString(it.DictValue), it => it.DictLabel, type, it => it.DictType == type);
+                }
+            }
+            return app;
+        }
     }
 }

ZR.Admin.WebApi/GlobalUsing.cs

@@ -8,3 +8,4 @@ global using Mapster;
 global using Infrastructure.Extensions;
 global using Infrastructure.Controllers;
 global using ZR.ServiceCore.Middleware;
+global using ZR.ServiceCore.Services;

ZR.Admin.WebApi/Program.cs

@@ -2,8 +2,8 @@ using AspNetCoreRateLimit;
 using Infrastructure.Converter;
 using Microsoft.AspNetCore.DataProtection;
 using NLog.Web;
+using SqlSugar;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using ZR.Admin.WebApi.Extensions;
 using ZR.Common.Cache;
 using ZR.Infrastructure.WebExtensions;
@@ -37,7 +37,8 @@ builder.Services.AddIPRate(builder.Configuration);
 builder.Services.AddHttpContextAccessor();
 //绑定整个对象到Model上
 builder.Services.Configure<OptionsSetting>(builder.Configuration);
-
+builder.Configuration.AddJsonFile("codeGen.json");
+builder.Configuration.AddJsonFile("iprate.json");
 //jwt 认证
 builder.Services.AddJwt();
 //配置文件
@@ -46,6 +47,8 @@ builder.Services.AddSingleton(new AppSettings(builder.Configuration));
 builder.Services.AddAppService();
 //开启计划任务
 builder.Services.AddTaskSchedulers();
+//请求大小限制
+builder.Services.AddRequestLimit(builder.Configuration);
 
 //注册REDIS 服务
 var openRedis = builder.Configuration["RedisServer:open"];
@@ -83,7 +86,12 @@ InternalApp.Configuration = builder.Configuration;
 InternalApp.WebHostEnvironment = app.Environment;
 //初始化db
 builder.Services.AddDb(app.Environment);
-
+var workId = builder.Configuration["workId"].ParseToInt();
+if (app.Environment.IsDevelopment())
+{
+    workId += 1;
+}
+SnowFlakeSingle.WorkId = workId;
 //使用全局异常中间件
 app.UseMiddleware<GlobalExceptionMiddleware>();
 
@@ -121,6 +129,9 @@ if (builder.Environment.IsProduction())
     //恢复/启动任务
     app.UseAddTaskSchedulers();
 }
+//初始化字典数据
+app.UseInit();
+
 //使用swagger
 app.UseSwagger();
 //启用客户端IP限制速率

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -15,12 +15,12 @@
 		<ProjectReference Include="..\ZR.Tasks\ZR.Tasks.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
+		<PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.6" />
+		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.12" />
-		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.3" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
-		<PackageReference Include="Mapster" Version="7.3.0" />
+		<PackageReference Include="Mapster" Version="7.4.0" />
-		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.5" />
+		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 	</ItemGroup>
 
 	<ItemGroup>

ZR.Admin.WebApi/appsettings.json

@@ -30,19 +30,22 @@
     "Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的（群体范围）
     "SecretKey": "SecretKey-ZRADMIN.NET-20210101",
     "Expire": 1440, //jwt登录过期时间（分）
-    "RefreshTokenTime": 5,//分钟
+    "RefreshTokenTime": 30, //分钟
     "TokenType": "Bearer"
   },
   "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks", "ZR.ServiceCore" ], //自动注入类
   "ShowDbLog": true, //是否打印db日志
   "InitDb": false, //是否初始化db
   "DemoMode": false, //是否演示模式
-  "SingleLogin": false,//是否单点登录
+  "SingleLogin": false, //是否允许多设备/浏览器登录
+  "workId": 1, //雪花id唯一数字
+  "sqlExecutionTime": 5, //Sql执行时间超过多少秒记录日志并警报
   "Upload": {
     "uploadUrl": "http://localhost:8888", //本地存储资源访问路径
     "localSavePath": "", //本地上传默认文件存储目录 wwwroot
     "maxSize": 15, //上传文件大小限制 15M
-    "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ]
+    "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ],
+    "requestLimitSize": 50//请求body大小限制
   },
   //阿里云存储配置
   "ALIYUN_OSS": {
@@ -65,26 +68,6 @@
     "AppID": "",
     "AppSecret": ""
   },
-  //代码生成配置
-  "gen": {
-    //是否显示移动端代码生成
-    "showApp": false,
-    //自动去除表前缀
-    "autoPre": true,
-    "author": "admin",
-    "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
-    "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3
-    "csharpTypeArr": {
-      "string": [ "varchar", "nvarchar", "text", "longtext" ],
-      "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ],
-      "long": [ "bigint", "number" ],
-      "float": [ "numeric", "real", "float" ],
-      "decimal": [ "money", "decimal", "smallmoney" ],
-      "dateTime": [ "date", "datetime", "datetime2", "smalldatetime", "timestamp" ],
-      "byte": [ "tinyint" ],
-      "bool": [ "bit" ]
-    }
-  },
   //邮箱配置信息
   "MailOptions": {
     //发件人名称
@@ -105,36 +88,20 @@
     "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:"
   },
-  //接口请求限制
-  "IpRateLimiting": {
-    "EnableEndpointRateLimiting": true,
-    "StackBlockedRequests": false,
-    "RealIpHeader": "X-Real-IP",
-    "ClientIdHeader": "X-ClientId",
-    "HttpStatusCode": 429,
-    "EndpointWhitelist": [ "post:/system/dict/data/types", "*:/msghub/negotiate", "*:/LogOut", "*:/common/uploadfile", "*:/VerifyScan" ],
-    "QuotaExceededResponse": {
-      "Content": "{{\"code\":429,\"msg\":\"访问过于频繁，请稍后重试\"}}",
-      "ContentType": "application/json",
-      "StatusCode": 429
-    },
-    //通用规则，api规则,结尾一定要带*
-    "GeneralRules": [
-      {
-        "Endpoint": "*:/captchaImage",
-        //时间段，格式：{数字}{单位}；可使用单位：s, m, h, d
-        "Period": "3s",
-        "Limit": 5
-      },
-      {
-        "Endpoint": "((post)|(put)):*",
-        "Period": "3s",
-        "Limit": 1
-      }
-    ]
-  },
   //验证码配置
   "CaptchaOptions": {
     "IgnoreCase": true // 比较时是否忽略大小写
+  },
+  //代码生成配置
+  "CodeGen": {
+    //是否显示移动端代码生成
+    "showApp": false,
+    //自动去除表前缀
+    "autoPre": true,
+    //默认生成业务模块名
+    "moduleName": "business",
+    "author": "admin",
+    "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
+    "vuePath": "" //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3
   }
 }

ZR.Admin.WebApi/codeGen.json

@@ -0,0 +1,14 @@
+{
+  "CodeGen": {
+    "csharpTypeArr": {
+      "string": [ "varchar", "nvarchar", "text", "longtext" ],
+      "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ],
+      "long": [ "bigint", "number" ],
+      "float": [ "numeric", "real", "float" ],
+      "decimal": [ "money", "decimal", "smallmoney" ],
+      "dateTime": [ "date", "datetime", "datetime2", "smalldatetime", "timestamp" ],
+      "byte": [ "tinyint" ],
+      "bool": [ "bit" ]
+    }
+  }
+}

ZR.Admin.WebApi/iprate.json

@@ -0,0 +1,30 @@
+{
+  //接口请求限制
+  "IpRateLimiting": {
+    "EnableEndpointRateLimiting": true,
+    "StackBlockedRequests": false,
+    "RealIpHeader": "X-Real-IP",
+    "ClientIdHeader": "X-ClientId",
+    "HttpStatusCode": 429,
+    "EndpointWhitelist": [ "post:/system/dict/data/types", "*:/msghub/negotiate", "*:/LogOut", "*:/common/uploadfile", "*:/VerifyScan" ],
+    "QuotaExceededResponse": {
+      "Content": "{{\"code\":429,\"msg\":\"访问过于频繁，请稍后重试\"}}",
+      "ContentType": "application/json",
+      "StatusCode": 429
+    },
+    //通用规则，api规则,结尾一定要带*
+    "GeneralRules": [
+      {
+        "Endpoint": "*:/captchaImage",
+        //时间段，格式：{数字}{单位}；可使用单位：s, m, h, d
+        "Period": "3s",
+        "Limit": 5
+      },
+      {
+        "Endpoint": "((post)|(put)):*",
+        "Period": "3s",
+        "Limit": 1
+      }
+    ]
+  }
+}

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt

@@ -80,7 +80,7 @@ $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
 */
 export function del${genTable.BusinessName}(pid) {
   return request({
-    url: '${genTable.ModuleName}/${genTable.BusinessName}/' + pid,
+    url: '${genTable.ModuleName}/${genTable.BusinessName}/delete/' + pid,
     method: 'delete'
   })
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/antDesign/Vue2.txt

@@ -0,0 +1 @@
+你在期待什么...

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/api.txt

@@ -56,7 +56,7 @@ $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
 */
 export function del${genTable.BusinessName}(pid) {
   return request({
-    url: '/${genTable.ModuleName}/${genTable.BusinessName}/' + pid,
+    url: '/${genTable.ModuleName}/${genTable.BusinessName}/delete/' + pid,
     method: 'delete'
   })
 }
@@ -73,6 +73,6 @@ $end
 $if(replaceDto.ShowBtnExport)
 // 导出${genTable.functionName}
 export async function export${genTable.BusinessName}(query) {
-  await downFile('$/{genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
+  await downFile('/${genTable.ModuleName}/${genTable.BusinessName}/export', { ...query })
 }
 $end

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt

@@ -12,7 +12,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long")
 $end
 
 $if(column.IsPK || column.IsIncrement)
-$if(column.IsPK && column.IsIncrement == false)
+$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false)
       <u-form-item label="${labelName}" prop="${columnName}">
         <u--input type="number" v-model.number="form.${columnName}" placeholder="请输入${labelName}" :disabled="opertype != 1"></u--input>
       </u-form-item>
@@ -83,7 +83,6 @@ $end
 </template>
 
 <script>
-  import "@/static/scss/page.scss";
   import {
     get${genTable.BusinessName},
 $if(replaceDto.ShowBtnAdd) 
@@ -92,15 +91,9 @@ $end
 $if(replaceDto.ShowBtnEdit) 
     update${genTable.BusinessName},
 $end
-  }
+  } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
-from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
   export default {
-$if(replaceDto.UploadFile == 1)
-    components: {
-      UploadImage
-    },
-$end
     dicts: [
 $foreach(item in genTable.Columns)
 $if((item.HtmlType == "radio" || item.HtmlType.Contains("select") || item.HtmlType == "checkbox") && item.DictType != "")
@@ -110,7 +103,15 @@ $end
     ],
     data() {
       return {
-        form: {},
+        form: {
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox")
+          ${item.CsharpFieldFl}Checked: [],
+$else
+          $item.CsharpFieldFl: undefined,
+$end
+$end
+        },
         rules: {
 $foreach(column in genTable.Columns)
 $if(column.IsRequired && column.IsIncrement == false)
@@ -202,7 +203,8 @@ $end
   }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+  @import "@/static/scss/page.scss";
   .btn-wrap {
     margin: 150rpx auto 0 auto;
     width: 80%

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt

@@ -134,14 +134,12 @@ $end
   import {
     checkPermi
   } from '@/utils/permission.js'
-  import "@/static/scss/page.scss";
   import {
     list${genTable.BusinessName},
 $if(replaceDto.ShowBtnDelete)
     del${genTable.BusinessName},
 $end
-  }
+  } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
-  from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
   import {
     getDate
@@ -286,3 +284,7 @@ $end
     }
   }
 </script>
+
+<style lang="scss" scoped>
+  @import "@/static/scss/page.scss";
+</style>

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/csharp/TplControllers.txt

@@ -66,7 +66,7 @@ $end
         {
             var response = _${replaceDto.ModelTypeName}Service.GetInfo(${replaceDto.PKName});
             
-            var info = response.Adapt<${replaceDto.ModelTypeName}>();
+            var info = response.Adapt<${replaceDto.ModelTypeName}Dto>();
             return SUCCESS(info);
         }
 
@@ -86,8 +86,8 @@ $if(replaceDto.ShowBtnAdd)
 
             return SUCCESS(response);
         }
-$end
 
+$end
 $if(replaceDto.ShowBtnEdit)
         /// <summary>
         /// 更新${genTable.FunctionName}
@@ -103,27 +103,24 @@ $if(replaceDto.ShowBtnEdit)
 
             return ToResponse(response);
         }
-$end
 
+$end
 $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
         /// <summary>
         /// 删除${genTable.FunctionName}
         /// </summary>
         /// <returns></returns>
-        [HttpDelete("{ids}")]
+        [HttpDelete("delete/{ids}")]
         [ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:delete")]
         [Log(Title = "${genTable.FunctionName}", BusinessType = BusinessType.DELETE)]
-        public IActionResult Delete${replaceDto.ModelTypeName}(string ids)
+        public IActionResult Delete${replaceDto.ModelTypeName}([FromRoute]string ids)
         {
-            int[] idsArr = Tools.SpitIntArrary(ids);
+            var idArr = Tools.SplitAndConvert<${replaceDto.PKType}>(ids);
-            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
 
-            var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr);
+            return ToResponse(_${replaceDto.ModelTypeName}Service.Delete(idArr$if(replaceDto.enableLog), "删除${genTable.FunctionName}"$end));
-
-            return ToResponse(response);
         }
-$end
 
+$end
 $if(replaceDto.ShowBtnExport)
         /// <summary>
         /// 导出${genTable.FunctionName}
@@ -136,7 +133,7 @@ $if(replaceDto.ShowBtnExport)
         {
             parm.PageNum = 1;
             parm.PageSize = 100000;
-            var list = _${replaceDto.ModelTypeName}Service.GetList(parm).Result;
+            var list = _${replaceDto.ModelTypeName}Service.ExportList(parm).Result;
             if (list == null || list.Count <= 0)
             {
                 return ToResponse(ResultCode.FAIL, "没有要导出的数据");
@@ -144,8 +141,8 @@ $if(replaceDto.ShowBtnExport)
             var result = ExportExcelMini(list, "${genTable.FunctionName}", "${genTable.FunctionName}");
             return ExportExcel(result.Item2, result.Item1);
         }
-$end
 
+$end
 $if(replaceDto.ShowBtnTruncate)
         /// <summary>
         /// 清空${genTable.FunctionName}
@@ -162,8 +159,8 @@ $if(replaceDto.ShowBtnTruncate)
             }
             return SUCCESS(_${replaceDto.ModelTypeName}Service.Truncate${replaceDto.ModelTypeName}());
         }
-$end
 
+$end
 $if(replaceDto.ShowBtnImport)
         /// <summary>
         /// 导入
@@ -196,8 +193,8 @@ $if(replaceDto.ShowBtnImport)
             var result = DownloadImportTemplate(new List<${replaceDto.ModelTypeName}Dto>() { }, "${replaceDto.ModelTypeName}");
             return ExportExcel(result.Item2, result.Item1);
         }
-$end
 
+$end
 $if(showCustomInput)
         /// <summary>
         /// 保存排序

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/csharp/TplDto.txt

@@ -1,7 +1,3 @@
-using System.ComponentModel.DataAnnotations;
-$if(replaceDto.ShowBtnExport)
-using MiniExcelLibs.Attributes;
-$end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
 using ${subTableOptions.ModelsNamespace}.${subTableOptions.SubNamespace};
 $end
@@ -33,18 +29,24 @@ $end
     public class ${replaceDto.ModelTypeName}Dto
     {
 $foreach(item in genTable.Columns)
+$set(labelName = "")
+$if(item.ColumnComment != "")
+$set(labelName = item.ColumnComment)
+$else
+$set(labelName = item.CsharpField)
+$end
 $if(item.IsRequired)
         [Required(ErrorMessage = "${item.ColumnComment}不能为空")]
 $end
 $if(replaceDto.ShowBtnExport)
 $if(item.IsExport)
-        [ExcelColumn(Name = "$if(item.ColumnComment == "")${item.CsharpField}${else}${item.ColumnComment}${end}"$if(item.CsharpType == "DateTime"), Format = "yyyy-MM-dd HH:mm:ss"$end)]
+        [ExcelColumn(Name = "$labelName"$if(item.CsharpType == "DateTime"), Format = "yyyy-MM-dd HH:mm:ss", Width = 20$end)]
-        [ExcelColumnName("$if(item.ColumnComment == "")${item.CsharpField}${else}${item.ColumnComment}${end}")]
+        [ExcelColumnName("$labelName")]
 $else
         [ExcelIgnore]
 $end
 $end
-$if(item.CsharpType == "long")
+$if(item.CsharpType == "long" && replaceDto.useSnowflakeId == true && item.IsPk)
         [JsonConverter(typeof(ValueToStringConverter))]
 $end
         public $item.CsharpType$item.RequiredStr $item.CsharpField { get; set; }
@@ -63,6 +65,12 @@ $if(replaceDto.ShowBtnExport)
         [ExcelIgnore]
 $end
         public List<${genTable.SubTable.ClassName}Dto> ${genTable.SubTable.ClassName}Nav { get; set; }
+$end
+$foreach(column in dicts)
+$if(column.IsExport)
+        [ExcelColumn(Name = "$if(column.ColumnComment == "")${column.CsharpField}${else}${column.ColumnComment}${end}")]
+        public string ${column.CsharpField}Label { get; set; }
+$end
 $end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/csharp/TplIService.txt

@@ -1,8 +1,6 @@
-using System;
+using ${options.BaseNamespace}Model;
-using ${options.BaseNamespace}Model;
 using ${options.DtosNamespace};
 using ${options.ModelsNamespace}.${options.SubNamespace};
-using System.Collections.Generic;
 
 namespace ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNamespace}Service
 {
@@ -18,6 +16,7 @@ namespace ${options.IServicsNamespace}.${options.SubNamespace}.I${options.SubNam
 $if(genTable.TplCategory == "tree")
         List<${replaceDto.ModelTypeName}> GetTreeList(${replaceDto.ModelTypeName}QueryDto parm);
 $end
+
         ${replaceDto.ModelTypeName} Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
 
         int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm);
@@ -28,5 +27,9 @@ $end
 $if(replaceDto.ShowBtnImport)
         (string, object, object) Import${replaceDto.ModelTypeName}(List<${replaceDto.ModelTypeName}> list);
 $end
+
+$if(replaceDto.ShowBtnExport)
+        PagedInfo<${replaceDto.ModelTypeName}Dto> ExportList(${replaceDto.ModelTypeName}QueryDto parm);
+$end
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/csharp/TplService.txt

@@ -1,6 +1,4 @@
-using System;
+using Infrastructure.Attribute;
-using SqlSugar;
-using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using ${options.BaseNamespace}Model;
 using ${options.DtosNamespace};
@@ -27,28 +25,8 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace}
         /// <returns></returns>
         public PagedInfo<${replaceDto.ModelTypeName}Dto> GetList(${replaceDto.ModelTypeName}QueryDto parm)
         {
-            var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
+            var predicate = QueryExp(parm);
 
-$foreach(column in genTable.Columns)
-$if(column.IsQuery)
-$if(column.HtmlType == "selectMulti")
-            predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => parm.${column.CsharpField}.Contains(it.${column.CsharpField}));
-$elseif(column.CsharpType == "string")
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$elseif(column.CsharpType == "DateTime")
-$if(column.HtmlType == "month")
-            DateTime monthEnd = Convert.ToDateTime(parm.${column.CsharpField}).AddMonths(1);
-            predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.${column.CsharpField} && it.${column.CsharpField} < monthEnd);
-$else
-            predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.ToShortDateString().ParseToDateTime());
-            predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField});
-            predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField});
-$end
-$elseif(column.CsharpType == "int" || column.CsharpType == "long")
-            predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
-$end
-$end
-$end
             var response = Queryable()
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
                 //.Includes(x => x.${genTable.SubTable.ClassName}Nav) //填充子对象
@@ -117,7 +95,12 @@ $end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
 $else
-            return Context.Insertable(model).ExecuteReturnEntity();
+$if(replaceDto.useSnowflakeId)
+            Insertable(model).ExecuteReturnSnowflakeId();
+            return model;
+$else
+            return Insertable(model).ExecuteReturnEntity();
+$end
 $end
         }
 
@@ -128,19 +111,10 @@ $end
         /// <returns></returns>
         public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} model)
         {
-            //var response = Update(w => w.${replaceDto.PKName} == model.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}()
-            //{
-$foreach(item in genTable.Columns)
-$if((item.IsEdit))
-            //    $item.CsharpField = model.$item.CsharpField,
-$end
-${end}
-            //});
-            //return response;
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.UpdateNav(model).Include(z1 => z1.${genTable.SubTable.ClassName}Nav).ExecuteCommand() ? 1 : 0;
 $else
-            return Update(model, true);
+            return Update(model, true$if(replaceDto.enableLog), "修改${genTable.FunctionName}"$end);
 $end
         }
 $if(replaceDto.ShowBtnTruncate)
@@ -194,5 +168,63 @@ $end
             return (msg, x.ErrorList, x.IgnoreList);
         }
 $end
+
+$if(replaceDto.ShowBtnExport)
+        /// <summary>
+        /// 导出${genTable.FunctionName}
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<${replaceDto.ModelTypeName}Dto> ExportList(${replaceDto.ModelTypeName}QueryDto parm)
+        {
+            var predicate = QueryExp(parm);
+
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .Select((it) => new ${replaceDto.ModelTypeName}Dto()
+                {
+$foreach(column in dicts)
+$if(column.DictType != "")
+                    ${column.CsharpField}Label = it.${column.CsharpField}.GetConfigValue<Model.System.SysDictData>("${column.DictType}"),
+$end
+$end
+                }, true)
+                .ToPage(parm);
+
+            return response;
+        }
+$end
+
+        /// <summary>
+        /// 查询导出表达式
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        private static Expressionable<${replaceDto.ModelTypeName}> QueryExp(${replaceDto.ModelTypeName}QueryDto parm)
+        {
+            var predicate = Expressionable.Create<${replaceDto.ModelTypeName}>();
+
+$foreach(column in genTable.Columns)
+$if(column.IsQuery)
+$if(column.HtmlType == "selectMulti")
+            predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => parm.${column.CsharpField}.Contains(it.${column.CsharpField}));
+$elseif(column.CsharpType == "string")
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.${column.CsharpField}), ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
+$elseif(column.CsharpType == "DateTime")
+$if(column.HtmlType == "month")
+            DateTime monthEnd = Convert.ToDateTime(parm.${column.CsharpField}).AddMonths(1);
+            predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.${column.CsharpField} && it.${column.CsharpField} < monthEnd);
+$else
+            predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.ToShortDateString().ParseToDateTime());
+            predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField});
+            predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField});
+$end
+$elseif(column.CsharpType == "int" || column.CsharpType == "long")
+            predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
+$end
+$end
+$end
+            return predicate;
+        }
     }
 }

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt

@@ -230,7 +230,7 @@ $end
 
 $* 一对一/一对多列表显示详情 *$
 $if(sub)
-    <el-drawer v-model="drawer" :with-header="false" direction="btt">
+    <el-drawer v-model="drawer" size="50%" direction="rtl">
       <el-table :data="$tool.FirstLowerCase(genTable.SubTable.ClassName)List" header-row-class-name="text-navy">
         <el-table-column label="序号" type="index" width="80" />
 $foreach(column in genSubTable.Columns)
@@ -267,7 +267,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long")
 $end
 
 $if(column.IsPK || column.IsIncrement)
-$if(column.IsPK && column.IsIncrement == false)
+$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false)
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-input v-model${number}="form.${columnName}" placeholder="请输入${labelName}" :disabled="opertype != 1"/>
@@ -392,7 +392,7 @@ $if(sub)
           </el-col>
         </el-row>
         <el-table :data="${tool.FirstLowerCase(genTable.SubTable.ClassName)}List" :row-class-name="row${genTable.SubTable.ClassName}Index" @selection-change="handle${genTable.SubTable.ClassName}SelectionChange" ref="${genTable.SubTable.ClassName}Ref">
-          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column type="selection" width="40" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
 $foreach(column in genTable.SubTable.Columns)
 $set(labelName = column.ColumnComment)
@@ -435,6 +435,12 @@ $elseif(column.HtmlType == "switch")
               <el-switch v-model="scope.row.${columnName}" ${switchType} />
             </template>
           </el-table-column>
+$elseif(column.HtmlType == "imageUpload")
+          <el-table-column label="${labelName}" prop="${columnName}">
+            <template #default="scope">
+              <UploadImage v-model="form.${columnName}" :isShowTip="false" :style="{ 'width': '50px' }" :data="{ uploadType: 1 }" />
+            </template>
+          </el-table-column>
 $else
           <el-table-column label="${labelName}" align="center" prop="${columnName}">
             <template #default="scope">
@@ -635,9 +641,11 @@ const state = reactive({
   form: {},
   rules: {
 $foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
+$if(column.IsRequired && column.IsPk && replaceDto.useSnowflakeId)
+    ${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end }],
+$elseif(column.IsRequired && column.IsIncrement == false)
     ${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }],
+    $if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number" $end }],
 $end
 $end
   },
@@ -675,6 +683,37 @@ $if(sub)
 $end
   proxy.resetForm("formRef")
 }
+
+$if(replaceDto.ShowBtnView)
+/**
+ * 查看
+ * @param {*} row
+ */
+function handlePreview(row) {
+  reset()
+    const id = row.${replaceDto.FistLowerPk}
+    get${genTable.BusinessName}(id).then((res) => {
+    const { code, data } = res
+    if (code == 200) {
+      open.value = true
+      title.value = '查看'
+      opertype.value = 3
+      form.value = {
+        ...data,
+$foreach(item in genTable.Columns)
+$if(item.HtmlType == "checkbox" || item.HtmlType == "selectMulti")
+        ${item.CsharpFieldFl}Checked: data.${item.CsharpFieldFl} ? data.${item.CsharpFieldFl}.split(',') : [],
+$end
+$end
+      }
+$if(sub)
+      ${tool.FirstLowerCase(genTable.SubTable.ClassName)}List.value = res.data.${tool.FirstLowerCase(genTable.SubTable.ClassName)}Nav
+$end
+    }
+  })
+}
+$end
+
 $if(replaceDto.ShowBtnAdd)
 // 添加按钮操作
 function handleAdd() {
@@ -782,20 +821,6 @@ function handleClear() {
 }
 $end
 
-$if(replaceDto.ShowBtnView)
-/**
- * 查看
- * @param {*} row
- */
-function handlePreview(row) {
-  reset()
-  open.value = true
-  title.value = '查看'
-  opertype.value = 3
-  form.value = { ...row }
-}
-$end
-
 $if(replaceDto.ShowBtnImport)
 // 导入数据成功处理
 const handleFileSuccess = (response) => {
@@ -841,6 +866,7 @@ function row${genTable.SubTable.ClassName}Index({ row, rowIndex }) {
 /** ${genTable.SubTable.FunctionName}添加按钮操作 */
 function handleAdd${genTable.SubTable.ClassName}() {
   let obj = {};
+  //下面的代码自己设置默认值
 $foreach(column in genTable.SubTable.Columns)
 $if(column.IsPK || column.CsharpField == genTable.SubTableFkName)
 $elseif(column.IsList == true && "" != column.CsharpField)

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -1,9 +1,4 @@
-using System;
+namespace ZR.CodeGenerator
-using System.Linq;
-using System.Text;
-using ZR.Model.System.Generate;
-
-namespace ZR.CodeGenerator
 {
     /// <summary>
     /// 代码生成模板

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -27,8 +27,8 @@ namespace ZR.CodeGenerator
         /// <param name="dto"></param>
         public static void Generate(GenerateDto dto)
         {
-            var genOptions = AppSettings.Get<Gen>("gen");
+            var genOptions = AppSettings.Get<CodeGen>("codeGen");
-            dto.VueParentPath = dto.VueVersion == 3 ? "ZRAdmin-vue" : "ZR.Vue";
+            dto.VueParentPath = "Frontend";
             if (!genOptions.VuePath.IsEmpty())
             {
                 dto.VueParentPath = genOptions.VuePath;
@@ -38,6 +38,10 @@ namespace ZR.CodeGenerator
             {
                 dto.SubTableOptions = GenerateOption(dto.GenTable.SubTable);
             }
+            if (dto.GenTable.SubTableName.IsNotEmpty() && dto.GenTable.SubTable == null)
+            {
+                throw new CustomException($"{dto.GenTable.SubTableName}子表不存在");
+            }
 
             ReplaceDto replaceDto = new()
             {
@@ -53,7 +57,9 @@ namespace ZR.CodeGenerator
                 ShowBtnMultiDel = dto.GenTable.Options.CheckedBtn.Any(f => f == 7),
                 ShowBtnImport = dto.GenTable.Options.CheckedBtn.Any(f => f == 8),
                 ViewFileName = dto.GenTable.BusinessName.FirstUpperCase(),
-                OperBtnStyle = dto.GenTable.Options.OperBtnStyle
+                OperBtnStyle = dto.GenTable.Options.OperBtnStyle,
+                UseSnowflakeId = dto.GenTable.Options.UseSnowflakeId,
+                EnableLog = dto.GenTable.Options.EnableLog
             };
             var columns = dto.GenTable.Columns;
 
@@ -69,14 +75,18 @@ namespace ZR.CodeGenerator
             GenerateModels(replaceDto, dto);
             GenerateService(replaceDto, dto);
             GenerateControllers(replaceDto, dto);
-            if (dto.VueVersion == 3)
+            if (dto.GenTable.Options.FrontTpl == 2)
             {
                 GenerateVue3Views(replaceDto, dto);
             }
-            else
+            else if (dto.GenTable.Options.FrontTpl == 1)
             {
                 GenerateVueViews(replaceDto, dto);
             }
+            else
+            {
+                GenerateAntDesignViews(replaceDto, dto);
+            }
             if (dto.GenTable.Options.GenerateRepo == 1)
             {
                 GenerateRepository(replaceDto, dto);
@@ -118,8 +128,9 @@ namespace ZR.CodeGenerator
         /// <param name="replaceDto">替换实体</param>
         private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, "TplModel.txt");
+            var path = Path.Combine(CodeTemplateDir, "csharp");
-            var tplDto = JnHelper.ReadTemplate(CodeTemplateDir, "TplDto.txt");
+            var tpl = JnHelper.ReadTemplate(path, "TplModel.txt");
+            var tplDto = JnHelper.ReadTemplate(path, "TplDto.txt");
 
             string fullPath = Path.Combine(generateDto.GenOptions.ModelsNamespace, "Models", generateDto.GenOptions.SubNamespace, replaceDto.ModelTypeName + ".cs");
             string fullPathDto = Path.Combine(generateDto.GenOptions.ModelsNamespace, "Dto", generateDto.GenOptions.SubNamespace, replaceDto.ModelTypeName + "Dto.cs");
@@ -135,7 +146,7 @@ namespace ZR.CodeGenerator
         /// <param name="replaceDto">替换实体</param>
         private static void GenerateRepository(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, "TplRepository.txt");
+            var tpl = JnHelper.ReadTemplate(Path.Combine(CodeTemplateDir, "csharp"), "TplRepository.txt");
             var result = tpl.Render();
             var fullPath = Path.Combine(generateDto.GenOptions.RepositoriesNamespace, generateDto.GenOptions.SubNamespace, $"{replaceDto.ModelTypeName}Repository.cs");
 
@@ -147,8 +158,9 @@ namespace ZR.CodeGenerator
         /// </summary>
         private static void GenerateService(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, "TplService.txt");
+            var path = Path.Combine(CodeTemplateDir, "csharp");
-            var tpl2 = JnHelper.ReadTemplate(CodeTemplateDir, "TplIService.txt");
+            var tpl = JnHelper.ReadTemplate(path, "TplService.txt");
+            var tpl2 = JnHelper.ReadTemplate(path, "TplIService.txt");
 
             var fullPath = Path.Combine(generateDto.GenOptions.ServicesNamespace, generateDto.GenOptions.SubNamespace, $"{replaceDto.ModelTypeName}Service.cs");
             var fullPath2 = Path.Combine(generateDto.GenOptions.IServicsNamespace, generateDto.GenOptions.SubNamespace, $"I{generateDto.GenOptions.SubNamespace}Service", $"I{replaceDto.ModelTypeName}Service.cs");
@@ -162,7 +174,7 @@ namespace ZR.CodeGenerator
         /// </summary>
         private static void GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, "TplControllers.txt");
+            var tpl = JnHelper.ReadTemplate(Path.Combine(CodeTemplateDir, "csharp"), "TplControllers.txt");
             tpl.Set("QueryCondition", replaceDto.QueryCondition);
             var result = tpl.Render();
 
@@ -180,9 +192,11 @@ namespace ZR.CodeGenerator
                 "select" => "TplVueSelect.txt",
                 _ => "TplVue.txt",
             };
-            replaceDto.VueViewListHtml = GenerateVueTableList();
+            var path = Path.Combine(CodeTemplateDir, "vue2");
-            replaceDto.VueQueryFormHtml = GenerateVueQueryForm();
+            fileName = Path.Combine("vue2", fileName);
-            replaceDto.VueViewFormHtml = GenerateCurdForm();
+            replaceDto.VueViewListHtml = JnHelper.ReadTemplate(path, "TableList.txt").Render();
+            replaceDto.VueQueryFormHtml = JnHelper.ReadTemplate(path, "QueryForm.txt").Render();
+            replaceDto.VueViewFormHtml = JnHelper.ReadTemplate(path, "CurdForm.txt").Render();
 
             var tpl = JnHelper.ReadTemplate(CodeTemplateDir, fileName);
             var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{replaceDto.ViewFileName}.vue");
@@ -213,6 +227,29 @@ namespace ZR.CodeGenerator
             generateDto.GenCodes.Add(new GenCode(16, "index.vue", fullPath, result));
         }
 
+        /// <summary>
+        /// AntDesign
+        /// </summary>
+        /// <param name="generateDto"></param>
+        private static void GenerateAntDesignViews(ReplaceDto replaceDto, GenerateDto generateDto)
+        {
+            string fileName = generateDto.GenTable.TplCategory switch
+            {
+                "tree" => "TreeVue.txt",
+                _ => "Vue2.txt",
+            };
+            fileName = Path.Combine("antDesign", fileName);
+            var tpl = JnHelper.ReadTemplate(CodeTemplateDir, fileName);
+            tpl.Set("treeCode", generateDto.GenTable?.Options?.TreeCode?.FirstLowerCase());
+            tpl.Set("treeName", generateDto.GenTable?.Options?.TreeName?.FirstLowerCase());
+            tpl.Set("treeParentCode", generateDto.GenTable?.Options?.TreeParentCode?.FirstLowerCase());
+            tpl.Set("options", generateDto.GenTable?.Options);
+
+            var result = tpl.Render();
+            var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{replaceDto.ViewFileName}.vue");
+            generateDto.GenCodes.Add(new GenCode(16, "index.vue", fullPath, result));
+        }
+
         /// <summary>
         /// 生成vue页面api
         /// </summary>
@@ -255,35 +292,9 @@ namespace ZR.CodeGenerator
             var result = tpl.Render();
             string fullPath = Path.Combine(generateDto.GenCodePath, "sql", generateDto.GenTable.BusinessName + ".sql");
 
-            generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(8, "sql菜单", fullPath, result));
         }
 
-        /// <summary>
-        /// 生成vue页面查询form
-        /// </summary>
-        /// <returns></returns>
-        public static string GenerateVueQueryForm()
-        {
-            return JnHelper.ReadTemplate(CodeTemplateDir, "QueryForm.txt").Render();
-        }
-
-        /// <summary>
-        /// 生成vue页面table
-        /// </summary>
-        /// <returns></returns>
-        public static string GenerateVueTableList()
-        {
-            return JnHelper.ReadTemplate(CodeTemplateDir, "TableList.txt").Render();
-        }
-
-        /// <summary>
-        /// 生成vue表单
-        /// </summary>
-        /// <returns></returns>
-        public static string GenerateCurdForm()
-        {
-            return JnHelper.ReadTemplate(CodeTemplateDir, "CurdForm.txt").Render();
-        }
         #endregion
 
         #region app页面
@@ -340,11 +351,8 @@ namespace ZR.CodeGenerator
         /// </summary>
         /// <param name="tableName"></param>
         /// <returns></returns>
-        public static string GetClassName(string tableName)
+        public static string GetClassName(string tableName, bool autoRemovePre, string tablePrefix)
         {
-            bool autoRemovePre = AppSettings.GetAppConfig(GenConstants.Gen_autoPre, false);
-            string tablePrefix = AppSettings.GetAppConfig<string>(GenConstants.Gen_tablePrefix);
-
             if (!string.IsNullOrEmpty(tablePrefix) && autoRemovePre)
             {
                 string[] prefixList = tablePrefix.Split(",", StringSplitOptions.RemoveEmptyEntries);
@@ -421,32 +429,32 @@ namespace ZR.CodeGenerator
         /// <summary>
         /// 初始化表信息
         /// </summary>
-        /// <param name="dbName"></param>
+        /// <param name="dto"></param>
-        /// <param name="userName"></param>
-        /// <param name="tableName"></param>
-        /// <param name="desc"></param>
         /// <returns></returns>
-        public static GenTable InitTable(string dbName, string userName, string tableName, string desc)
+        public static GenTable InitTable(InitTableDto dto)
         {
+            var className = GetClassName(dto.TableName, dto.CodeGen.AutoPre, dto.CodeGen.TablePrefix);
+
             GenTable genTable = new()
             {
-                DbName = dbName,
+                DbName = dto.DbName,
                 BaseNameSpace = "ZR.",//导入默认命名空间前缀
-                ModuleName = "business",//导入默认模块名
+                ModuleName = dto.CodeGen.ModuleName,//导入默认模块名
-                ClassName = GetClassName(tableName),
+                ClassName = className,
-                BusinessName = GetClassName(tableName),
+                BusinessName = className,
-                FunctionAuthor = AppSettings.GetConfig(GenConstants.Gen_author),
+                FunctionAuthor = dto.CodeGen.Author,
-                TableName = tableName,
+                TableName = dto.TableName,
-                TableComment = desc,
+                TableComment = dto.Desc,
-                FunctionName = desc,
+                FunctionName = dto.Desc,
-                Create_by = userName,
+                Create_by = dto.UserName,
-                Options = new Options()
+                Options = new CodeOptions()
                 {
                     SortType = "asc",
-                    CheckedBtn = new int[] { 1, 2, 3 }
+                    CheckedBtn = new int[] { 1, 2, 3 },
+                    PermissionPrefix = className.ToLower(),
+                    FrontTpl = dto.FrontTpl
                 }
             };
-            genTable.Options.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
 
             return genTable;
         }
@@ -457,16 +465,16 @@ namespace ZR.CodeGenerator
         /// <param name="genTable"></param>
         /// <param name="dbColumnInfos"></param>
         /// <param name="seqs"></param>
-        public static List<GenTableColumn> InitGenTableColumn(GenTable genTable, List<DbColumnInfo> dbColumnInfos, List<OracleSeq> seqs = null)
+        /// <param name="codeGen"></param>
+        public static List<GenTableColumn> InitGenTableColumn(GenTable genTable, List<DbColumnInfo> dbColumnInfos, List<OracleSeq> seqs = null, CodeGen codeGen = null)
         {
             OptionsSetting optionsSetting = new();
 
-            var gen = AppSettings.Get<Gen>("gen");
+            var dbConfig = AppSettings.Get<DbConfigs>(nameof(GenConstants.CodeGenDbConfig));
-            var dbConfig = AppSettings.Get<DbConfigs>("CodeGenDbConfig");
+
+            optionsSetting.CodeGenDbConfig = dbConfig ?? throw new CustomException("代码生成节点数据配置异常"); ;
+            optionsSetting.CodeGen = codeGen ?? throw new CustomException("代码生成节点配置异常");
 
-            optionsSetting.CodeGenDbConfig = dbConfig;
-            optionsSetting.Gen = gen ?? throw new CustomException("代码生成节点配置异常");
-            optionsSetting.Gen.GenDbConfig = dbConfig ?? throw new CustomException("代码生成节点数据配置异常");
             List<GenTableColumn> genTableColumns = new();
             foreach (var column in dbColumnInfos)
             {
@@ -486,7 +494,7 @@ namespace ZR.CodeGenerator
         private static GenTableColumn InitColumnField(GenTable genTable, DbColumnInfo column, List<OracleSeq> seqs, OptionsSetting optionsSetting)
         {
             var dataType = column.DataType;
-            if (optionsSetting.Gen.GenDbConfig.DbType == 3)
+            if (optionsSetting.CodeGenDbConfig.DbType == 3)
             {
                 dataType = column.OracleDataType;
                 var seqName = $"SEQ_{genTable.TableName}_{column.DbColumnName}";
@@ -501,7 +509,7 @@ namespace ZR.CodeGenerator
                 ColumnType = dataType,
                 TableId = genTable.TableId,
                 TableName = genTable.TableName,
-                CsharpType = GetCSharpDatatype(dataType, optionsSetting.Gen.CsharpTypeArr).ToString(),
+                CsharpType = GetCSharpDatatype(dataType, optionsSetting.CodeGen.CsharpTypeArr).ToString(),
                 CsharpField = column.DbColumnName.ConvertToPascal("_"),
                 IsRequired = !column.IsNullable,
                 IsIncrement = column.IsIdentity,
@@ -604,7 +612,7 @@ namespace ZR.CodeGenerator
                 options.Data.Set("showCustomInput", showCustomInput);
                 options.Data.Set("tool", new CodeGeneratorTool());
                 options.Data.Set("codeTool", new CodeGenerateTemplate());
-                options.Data.Set("dicts", dicts);
+                options.Data.Set("dicts", dicts.DistinctBy(x => x.DictType));
                 options.Data.Set("sub", dto.GenTable.SubTable != null && dto.GenTable.SubTableName.IsNotEmpty());
                 options.EnableCache = true;
                 //...其它数据

ZR.CodeGenerator/GenConstants.cs

@@ -7,9 +7,8 @@ namespace ZR.CodeGenerator
     /// </summary>
     public class GenConstants
     {
-        public static string Gen_author = "gen:author";
+        public static string Gen_author = "codeGen:author";
-        public static string Gen_autoPre = "gen:autoPre";
+        public static string CodeGenDbConfig;
-        public static string Gen_tablePrefix = "gen:tablePrefix";
 
         /// <summary>
         /// InputDto输入实体是不包含字段

ZR.CodeGenerator/Model/CodeGenerateOption.cs

@@ -1,4 +1,4 @@
-namespace ZR.CodeGenerator
+namespace ZR.CodeGenerator.Model
 {
     public class CodeGenerateOption
     {
@@ -39,11 +39,6 @@
         /// Api控制器命名空间
         /// </summary>
         public string ApiControllerNamespace { get; set; }
-
-        /// <summary>
-        /// 去掉的表头字符
-        /// </summary>
-        public string ReplaceTableNameStr { get; set; }
         /// <summary>
         /// 要生数据的表，用“，”分割
         /// </summary>

ZR.CodeGenerator/Model/ImportCodeGenTableDto.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace ZR.CodeGenerator.Model
+{
+    public class ImportCodeGenTableDto
+    {
+        public int FrontTpl { get; set; }
+        public string DbName { get; set; }
+        public List<CodeGenTables> Tables { get; set; }
+    }
+
+    public class CodeGenTables
+    {
+        public string Name { get; set; }
+        public string Description { get; set; }
+    }
+}

ZR.CodeGenerator/Model/InitTableDto.cs

@@ -0,0 +1,14 @@
+using Infrastructure.Model;
+
+namespace ZR.CodeGenerator.Model
+{
+    public class InitTableDto
+    {
+        public int FrontTpl { get; set; }
+        public string DbName { get; set; }
+        public string UserName { get; set; }
+        public string TableName { get; set; }
+        public string Desc { get; set; }
+        public CodeGen CodeGen { get; set; }
+    }
+}

ZR.CodeGenerator/Model/ReplaceDto.cs

@@ -11,7 +11,7 @@ namespace ZR.CodeGenerator.Model
         /// <summary>
         /// 首字母小写主键
         /// </summary>
-        public string FistLowerPk{ get; set; }
+        public string FistLowerPk { get; set; }
         /// <summary>
         /// 主键类型
         /// </summary>
@@ -74,5 +74,10 @@ namespace ZR.CodeGenerator.Model
         /// 操作按钮样式
         /// </summary>
         public int OperBtnStyle { get; set; }
+        /// <summary>
+        /// 是否使用雪花id
+        /// </summary>
+        public bool UseSnowflakeId { get; set; }
+        public bool EnableLog { get; set; }
     }
 }

ZR.CodeGenerator/Service/CodeGeneraterService.cs

@@ -18,7 +18,7 @@ namespace ZR.CodeGenerator.Service
         {
             var db = GetSugarDbContext();
             //Oracle库特殊处理
-            DbConfigs configs = AppSettings.Get<DbConfigs>(nameof(GlobalConstant.CodeGenDbConfig));
+            DbConfigs configs = AppSettings.Get<DbConfigs>(nameof(GenConstants.CodeGenDbConfig));
             if (configs.DbType == 3)
             {
                 return new List<string>() { configs?.DbName };

ZR.CodeGenerator/ZR.CodeGenerator.csproj

@@ -11,7 +11,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JinianNet.JNTemplate" Version="2.3.3" />
+		<PackageReference Include="JinianNet.JNTemplate" Version="2.4.2" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.130" />
 	</ItemGroup>
 </Project>

ZR.Common/Tools.cs

@@ -29,6 +29,18 @@ namespace ZR.Common
             int[] infoIdss = Array.ConvertAll(strIds, s => int.Parse(s));
             return infoIdss;
         }
+        public static T[] SplitAndConvert<T>(string input, char split = ',')
+        {
+            if (string.IsNullOrEmpty(input)) { return Array.Empty<T>(); }
+            string[] parts = input.Split(split, (char)StringSplitOptions.RemoveEmptyEntries);
+            T[] result =  Array.ConvertAll(parts, s => (T)Convert.ChangeType(s, typeof(T)));
+            //for (int i = 0; i < parts.Length; i++)
+            //{
+            //    result[i] = (T)Convert.ChangeType(parts[i], typeof(T));
+            //}
+
+            return result;
+        }
 
         /// <summary>
         /// 根据日期获取星期几

ZR.Common/WxNoticeHelper.cs

@@ -42,7 +42,7 @@ namespace ZR.Common
             }
             if (string.IsNullOrEmpty(CORPID))
             {
-                System.Console.WriteLine("请完成企业微信配置");
+                System.Console.WriteLine("如需微信接收异常消息，请完成企业微信配置");
                 return (0, "请完成企业微信通知配置");
             }
             WxTokenResult tokenResult = GetAccessToken();

ZR.Common/ZR.Common.csproj

@@ -6,7 +6,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
-		<PackageReference Include="MailKit" Version="4.1.0" />
+		<PackageReference Include="MailKit" Version="4.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>

ZR.Model/GlobalUsing.cs

@@ -2,3 +2,5 @@
 global using System;
 global using SqlSugar;
 global using Newtonsoft.Json;
+global using MiniExcelLibs.Attributes;
+global using System.ComponentModel.DataAnnotations;

ZR.Model/ZR.Model.csproj

@@ -7,9 +7,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MiniExcel" Version="1.31.2" />
+		<PackageReference Include="MiniExcel" Version="1.31.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.130" />
 		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
 	</ItemGroup>
 </Project>

ZR.Repository/BaseRepository.cs

@@ -146,8 +146,8 @@ namespace ZR.Repository
             }
             catch (Exception ex)
             {
+                Console.WriteLine("事务异常" + ex.Message);
                 client.AsTenant().RollbackTran();
-                Console.WriteLine(ex.Message);
                 throw;
             }
         }

ZR.Repository/ZR.Repository.csproj

@@ -10,9 +10,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Mapster" Version="7.3.0" />
+		<PackageReference Include="Mapster" Version="7.4.0" />
-		<PackageReference Include="MySqlConnector" Version="2.2.6" />
+		<PackageReference Include="MySqlConnector" Version="2.3.1" />
 		<PackageReference Include="SqlSugar.IOC" Version="2.0.0" />
-		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.105" />
+		<PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.130" />
 	</ItemGroup>
 </Project>

ZR.Service/GlobalUsing.cs

@@ -2,3 +2,4 @@
 global using System;
 global using SqlSugar;
 global using Newtonsoft.Json;
+global using ZR.ServiceCore;

ZR.Service/HelloService.cs

@@ -4,7 +4,7 @@ using SqlSugar.IOC;
 using ZR.Model.System;
 using ZR.Repository;
 using ZR.Service.IService;
-using ZR.Service.System.IService;
+using ZR.ServiceCore.Services;
 
 namespace ZR.Service
 {

ZR.ServiceCore/BaseService.cs

@@ -1,6 +1,6 @@
 using ZR.Repository;
 
-namespace ZR.Service
+namespace ZR.ServiceCore
 {
     /// <summary>
     /// 基础服务定义

ZR.ServiceCore/Filters/ActionPermissionFilter.cs

@@ -3,8 +3,7 @@ using Infrastructure.Model;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using ZR.Model.System;
-using ZR.Service.System;
+using ZR.ServiceCore.Services;
-using ZR.Service.System.IService;
 
 namespace ZR.ServiceCore.Middleware
 {
@@ -82,10 +81,11 @@ namespace ZR.ServiceCore.Middleware
                 if (!HasPermi && !Permission.Equals("common"))
                 {
                     logger.Info($"用户{info.UserName}没有权限访问{url}，当前权限[{Permission}]");
-                    JsonResult result = new(new ApiResult((int)ResultCode.FORBIDDEN, $"你当前没有权限[{Permission}]访问,请联系管理员", url))
+                    JsonResult result = new(new ApiResult((int)ResultCode.FORBIDDEN, $"你当前没有权限访问,请联系管理员", url))
                     {
                         ContentType = "application/json",
                     };
+                    context.HttpContext.Response.StatusCode = 403;
                     context.Result = result;
                 }
             }

ZR.ServiceCore/Filters/GlobalActionMonitor.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using NLog;
 using ZR.Model.System;
-using ZR.Service.System.IService;
+using ZR.ServiceCore.Services;
 
 namespace ZR.ServiceCore.Middleware
 {

ZR.ServiceCore/Filters/VerifyAttribute.cs

@@ -16,6 +16,7 @@ namespace ZR.Admin.WebApi.Filters
     [AttributeUsage(AttributeTargets.All)]
     public class VerifyAttribute : Attribute, IAuthorizationFilter
     {
+        private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         /// <summary>
         /// 只判断token是否正确，不判断权限
         /// 如果需要判断权限的在Action上加上ApiActionPermission属性标识权限类别，ActionPermissionFilter作权限处理
@@ -56,6 +57,7 @@ namespace ZR.Admin.WebApi.Filters
                     {
                         context.HttpContext.Response.Headers.Add("Access-Control-Expose-Headers", "X-Refresh-Token");
                     }
+                    logger.Info($"刷新token,userName={loginUser.UserName},token={newToken}");
                     context.HttpContext.Response.Headers.Add("X-Refresh-Token", newToken);
                 }
             }

ZR.ServiceCore/IBaseService.cs

@@ -1,6 +1,6 @@
 using ZR.Repository;
 
-namespace ZR.Service
+namespace ZR.ServiceCore
 {
     /// <summary>
     /// 基础服务定义

ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs

@@ -8,7 +8,7 @@ using NLog;
 using System.Text.Encodings.Web;
 using ZR.Common;
 using ZR.Model.System;
-using ZR.Service.System.IService;
+using ZR.ServiceCore.Services;
 using textJson = System.Text.Json;
 
 namespace ZR.ServiceCore.Middleware

ZR.ServiceCore/Model/Dto/ChatMessageDto.cs

@@ -0,0 +1,31 @@
+namespace ZR.ServiceCore.Model.Dto
+{
+    public class ChatMessageDto
+    {
+        public ChatUserDto FromUser { get; set; }
+        public bool Self { get; set; }
+        [SugarColumn(IsPrimaryKey = true)]
+        public string ChatId { get; set; }
+        /// <summary>
+        /// 0、文本 1、图片 2、文件 3、语音 4、视频
+        /// </summary>
+        public int MsgType { get; set; }
+        public string StoredKey { get; set; }
+        public long UserId { get; set; }
+        public long ToUserId { get; set; }
+
+        /// <summary>
+        /// 消息内容，如果type=1/2/3/4，此属性表示文件的URL地址
+        /// </summary>
+        public string Message { get; set; }
+        public long ChatTime { get; set; }
+        public int Online { get; set; }
+    }
+
+    public class ChatUserDto
+    {
+        public string UserName { get; set; }
+        public string NickName { get; set; }
+        public string Avatar { get; set; }
+    }
+}

ZR.ServiceCore/Model/Dto/EmailLogDto.cs

@@ -0,0 +1,44 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 邮件发送记录查询对象
+    /// </summary>
+    public class EmailLogQueryDto : PagerInfo
+    {
+        public string FromEmail { get; set; }
+        public string Subject { get; set; }
+        public DateTime? BeginAddTime { get; set; }
+        public DateTime? EndAddTime { get; set; }
+    }
+
+    /// <summary>
+    /// 邮件发送记录输入输出对象
+    /// </summary>
+    public class EmailLogDto
+    {
+        //[Required(ErrorMessage = "Id不能为空")]
+        [JsonConverter(typeof(ValueToStringConverter))]
+        public long Id { get; set; }
+
+        public string FromEmail { get; set; }
+
+        public string Subject { get; set; }
+
+        public string ToEmails { get; set; }
+
+        public string EmailContent { get; set; }
+
+        public DateTime? AddTime { get; set; }
+        /// <summary>
+        /// 是否已发送
+        /// </summary>
+        public int IsSend { get; set; }
+        /// <summary>
+        /// 发送结果
+        /// </summary>
+        public string SendResult { get; set; }
+        public long[] IdArr { get; set; }
+    }
+}

ZR.ServiceCore/Model/Dto/EmailTplDto.cs

@@ -0,0 +1,39 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 邮件模板查询对象
+    /// </summary>
+    public class EmailTplQueryDto : PagerInfo 
+    {
+        public string Name { get; set; }
+    }
+
+    /// <summary>
+    /// 邮件模板输入输出对象
+    /// </summary>
+    public class EmailTplDto
+    {
+        public int? Id { get; set; }
+
+        [Required(ErrorMessage = "Name不能为空")]
+        public string Name { get; set; }
+
+        [Required(ErrorMessage = "模板内容不能为空")]
+        public string Content { get; set; }
+
+        public string CreateBy { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string UpdateBy { get; set; }
+
+        public DateTime? UpdateTime { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

ZR.ServiceCore/Model/Dto/GenTableDto.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
+using ZR.Model.System.Generate;
-using ZR.Model.System.Generate;
 
 namespace ZR.Model.System.Dto
 {
@@ -24,28 +23,10 @@ namespace ZR.Model.System.Dto
         /// <summary>
         /// 额外参数
         /// </summary>
-        public Options Params { get; set; }
+        public CodeOptions Params { get; set; }
         public List<GenTableColumnDto> Columns { get; set; }
     }
 
-    /// <summary>
-    /// 额外参数
-    /// ****注意里面参数统一首字母小写*****
-    /// </summary>
-    public class Params
-    {
-        public string TreeCode { get; set; }
-        public string TreeName { get; set; }
-        public string TreeParentCode { get; set; }
-        public int? ParentMenuId { get; set; }
-        public string SortField { get; set; }
-        public string SortType { get; set; }
-        /// <summary>
-        /// 额外参数字符串
-        /// </summary>
-        public string CheckedBtn { get; set; }
-        public string PermissionPrefix { get; set; }
-    }
     public class GenTableColumnDto
     {
         public int ColumnId { get; set; }

ZR.ServiceCore/Model/Dto/PhoneLoginDto.cs

@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace ZR.ServiceCore.Model.Dto
+{
+    public class PhoneLoginDto
+    {
+        /// <summary>
+        /// 验证码
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 唯一标识
+        /// </summary>
+        public string Uuid { get; set; } = "";
+        public string LoginIP { get; set; }
+        [Required(ErrorMessage = "手机号不能为空")]
+        public string PhoneNum { get; set; }
+        /// <summary>
+        /// 手机短信验证码
+        /// </summary>
+        //[Required(ErrorMessage = "短信验证码不能为空")]
+        public string PhoneCode { get; set; }
+    }
+}

ZR.ServiceCore/Model/Dto/RegisterDto.cs

@@ -30,5 +30,6 @@ namespace ZR.Model.System.Dto
         /// 头像
         /// </summary>
         public string Photo { get; set; }
+        public string UserIP { get; set; }
     }
 }