From 2ae73a7d1dd7835823b6a896cfdeddea64373899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=93=E5=BD=93?= <4019449@qq.com>
Date: Mon, 30 May 2022 12:19:17 +0000
Subject: [PATCH 1/7] =?UTF-8?q?update=20ZR.Vue/src/views/tool/gen/editTabl?=
 =?UTF-8?q?e.vue.=20=E5=88=A0=E9=99=A4=E4=BA=86=E5=88=97=E7=9A=84fixed?=
 =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E8=A1=8C=E5=8F=AF=E4=BB=A5=E6=8B=96?=
 =?UTF-8?q?=E6=94=BE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/tool/gen/editTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index da29d09..372b7ff 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -9,9 +9,9 @@
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="cloum">
         <el-table ref="dragTable" v-loading="loading" :data="columns" row-key="columnId" min-height="150px" :max-height="tableHeight">
-          <el-table-column label="序号" type="index" class-name="allowDrag" fixed />
-          <el-table-column label="字段列名" prop="columnName" :show-overflow-tooltip="true" fixed />
-          <el-table-column label="字段描述" fixed>
+          <el-table-column label="序号" type="index" class-name="allowDrag"  />
+          <el-table-column label="字段列名" prop="columnName" :show-overflow-tooltip="true"  />
+          <el-table-column label="字段描述" >
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment" :ref="scope.row.columnId" @keydown.native="nextFocus(scope.row, scope.$index, $event)">
               </el-input>

From 254c49e6767982229ca638ce502e27e373a5224c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 11 Jun 2022 18:58:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../System/CommonLangController.cs            | 50 ++++---------------
 ZR.Service/System/CommonLangService.cs        | 42 ++++++++++++++--
 .../ICommonLangService.cs                     |  4 +-
 3 files changed, 50 insertions(+), 46 deletions(-)
 rename ZR.Service/System/{ISystemService => IService}/ICommonLangService.cs (75%)

diff --git a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs
index a777d5f..6b03095 100644
--- a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs
@@ -6,14 +6,13 @@ using Infrastructure.Model;
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System;
 using System.Collections.Generic;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using ZR.Model;
 using ZR.Model.Dto;
 using ZR.Model.Models;
-using ZR.Service.System.ISystemService;
+using ZR.Service.System.IService;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -45,8 +44,10 @@ namespace ZR.Admin.WebApi.Controllers
         {
             if (parm.ShowMode == 2)
             {
-                PagedInfo<dynamic> pagedInfo = new();
-                pagedInfo.Result = _CommonLangService.GetListToPivot(parm);
+                PagedInfo<dynamic> pagedInfo = new()
+                {
+                    Result = _CommonLangService.GetListToPivot(parm)
+                };
 
                 return SUCCESS(pagedInfo);
             }
@@ -60,34 +61,11 @@ namespace ZR.Admin.WebApi.Controllers
         /// <returns></returns>
         [HttpGet("list/{lang}")]
         [AllowAnonymous]
-        public IActionResult QueryCommonLangs()
+        public IActionResult QueryCommonLangs(string lang)
         {
-            var msgList = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "zh-cn" });
-            var msgListEn = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "en" });
-            var msgListTw = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = "zh-tw" });
-            Dictionary<string, object> dic = new();
-            Dictionary<string, object> dicEn = new();
-            Dictionary<string, object> dicTw = new();
-            SetLang(msgList, dic);
-            SetLang(msgListEn, dicEn);
-            SetLang(msgListTw, dicTw);
-            return SUCCESS(new
-            {
-                en = dicEn,
-                cn = dic,
-                tw = dicTw
-            });
-        }
+            var msgList = _CommonLangService.GetLangList(new CommonLangQueryDto() { LangCode = lang });
 
-        private static void SetLang(List<CommonLang> msgList, Dictionary<string, object> dic)
-        {
-            foreach (var item in msgList)
-            {
-                if (!dic.ContainsKey(item.LangKey))
-                {
-                    dic.Add(item.LangKey, item.LangName);
-                }
-            }
+            return SUCCESS(_CommonLangService.SetLang(msgList));
         }
 
         /// <summary>
@@ -137,17 +115,9 @@ namespace ZR.Admin.WebApi.Controllers
                 throw new CustomException("请求实体不能为空");
             }
 
-            List<CommonLang> langs = new();
-            foreach (var item in parm.LangList)
-            {
-                langs.Add(new CommonLang() { Addtime = DateTime.Now, LangKey = parm.LangKey, LangCode = item.LangCode, LangName = item.LangName });
-            }
-            var storage = _CommonLangService.Storageable(langs).WhereColumns(it => new { it.LangKey, it.LangCode }).ToStorage();
+            _CommonLangService.StorageCommonLang(parm);
 
-            long r = storage.AsInsertable.ExecuteReturnSnowflakeId();//执行插入
-            storage.AsUpdateable.UpdateColumns(it => new { it.LangName }).ExecuteCommand();//执行修改
-
-            return ToResponse(r);
+            return ToResponse(1);
         }
 
         /// <summary>
diff --git a/ZR.Service/System/CommonLangService.cs b/ZR.Service/System/CommonLangService.cs
index 818442d..4abe031 100644
--- a/ZR.Service/System/CommonLangService.cs
+++ b/ZR.Service/System/CommonLangService.cs
@@ -1,12 +1,13 @@
 using Infrastructure.Attribute;
 using SqlSugar;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
 using ZR.Model.Dto;
 using ZR.Model.Models;
 using ZR.Repository;
-using ZR.Service.System.ISystemService;
+using ZR.Service.System.IService;
 
 namespace ZR.Service.System
 {
@@ -40,7 +41,6 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
             predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
@@ -62,7 +62,6 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
             predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
@@ -79,14 +78,47 @@ namespace ZR.Service.System
             //搜索条件查询语法参考Sqlsugar
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangCode), it => it.LangCode == parm.LangCode);
             //predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.LangKey), it => it.LangKey.Contains(parm.LangKey));
-            //predicate = predicate.AndIF(parm.BeginAddtime == null, it => it.Addtime >= DateTime.Now.AddDays(-1));
-            //predicate = predicate.AndIF(parm.BeginAddtime != null, it => it.Addtime >= parm.BeginAddtime && it.Addtime <= parm.EndAddtime);
             var response = _CommonLangrepository
                 .Queryable()
                 .Where(predicate.ToExpression())
                 .ToList();
             return response;
         }
+
+        public void StorageCommonLang(CommonLangDto parm)
+        {
+            List<CommonLang> langs = new();
+            foreach (var item in parm.LangList)
+            {
+                langs.Add(new CommonLang()
+                {
+                    Addtime = DateTime.Now,
+                    LangKey = parm.LangKey,
+                    LangCode = item.LangCode,
+                    LangName = item.LangName,
+                });
+            }
+            var storage = _CommonLangrepository.Storageable(langs)
+                .WhereColumns(it => new { it.LangKey, it.LangCode })
+                .ToStorage();
+
+            storage.AsInsertable.ExecuteReturnSnowflakeIdList();//执行插入
+            storage.AsUpdateable.UpdateColumns(it => new { it.LangName }).ExecuteCommand();//执行修改
+        }
+
+        public Dictionary<string, object> SetLang(List<CommonLang> msgList)
+        {
+            Dictionary<string, object> dic = new();
+
+            foreach (var item in msgList)
+            {
+                if (!dic.ContainsKey(item.LangKey))
+                {
+                    dic.Add(item.LangKey, item.LangName);
+                }
+            }
+            return dic;
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/ZR.Service/System/ISystemService/ICommonLangService.cs b/ZR.Service/System/IService/ICommonLangService.cs
similarity index 75%
rename from ZR.Service/System/ISystemService/ICommonLangService.cs
rename to ZR.Service/System/IService/ICommonLangService.cs
index 67c6351..b8a3f5f 100644
--- a/ZR.Service/System/ISystemService/ICommonLangService.cs
+++ b/ZR.Service/System/IService/ICommonLangService.cs
@@ -4,7 +4,7 @@ using ZR.Model.Dto;
 using ZR.Model.Models;
 using System.Collections.Generic;
 
-namespace ZR.Service.System.ISystemService
+namespace ZR.Service.System.IService
 {
     /// <summary>
     /// 多语言配置service接口
@@ -17,5 +17,7 @@ namespace ZR.Service.System.ISystemService
         PagedInfo<CommonLang> GetList(CommonLangQueryDto parm);
         List<CommonLang> GetLangList(CommonLangQueryDto parm);
         dynamic GetListToPivot(CommonLangQueryDto parm);
+        void StorageCommonLang(CommonLangDto parm);
+        Dictionary<string, object> SetLang(List<CommonLang> msgList);
     }
 }

From c265d6d413c660f4464e07fca0c577794fb524d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 12 Jun 2022 21:36:58 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=94=A8=E6=88=B7=E8=81=8A=E5=A4=A9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Hubs/MessageHub.cs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs
index f549968..6ffa95e 100644
--- a/ZR.Admin.WebApi/Hubs/MessageHub.cs
+++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs
@@ -21,7 +21,7 @@ namespace ZR.Admin.WebApi.Hubs
         private static readonly List<OnlineUsers> clientUsers = new();
         private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
         private readonly ISysNoticeService SysNoticeService;
-        
+
         public MessageHub(ISysNoticeService noticeService)
         {
             SysNoticeService = noticeService;
@@ -45,7 +45,7 @@ namespace ZR.Admin.WebApi.Hubs
             var name = Context.User.Identity.Name;
             var ip = HttpContextExtension.GetClientUserIp(App.HttpContext);
             var ip_info = IpTool.Search(ip);
-            
+
             LoginUser loginUser = JwtUtil.GetLoginUser(App.HttpContext);
             var user = clientUsers.Any(u => u.ConnnectionId == Context.ConnectionId);
             //判断用户是否存在，否则添加集合
@@ -60,7 +60,7 @@ namespace ZR.Admin.WebApi.Hubs
                 //Clients.All.SendAsync("welcome", $"欢迎您：{name},当前时间：{DateTime.Now}");
                 Clients.All.SendAsync(HubsConstant.MoreNotice, SendNotice());
             }
-            
+
             Clients.All.SendAsync(HubsConstant.OnlineNum, clientUsers.Count);
             Clients.All.SendAsync(HubsConstant.OnlineUser, clientUsers);
             return base.OnConnectedAsync();
@@ -85,5 +85,25 @@ namespace ZR.Admin.WebApi.Hubs
         }
 
         #endregion
+
+        /// <summary>
+        /// 注册信息
+        /// </summary>
+        /// <param name="connectId"></param>
+        /// <param name="userName"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        [HubMethodName("SendMessage")]
+        public async Task SendMessage(string connectId, string userName, string message)
+        {
+            Console.WriteLine($"{connectId},message={message}");
+            bool isDemoMode = AppSettings.GetAppConfig("DemoMode", true);
+            if (isDemoMode)
+            {
+                await Clients.Caller.SendAsync("receiveChat", new { userName, message = "当前环境为演示环境，消息不会发送给对方" });
+                return;
+            }
+            await Clients.Client(connectId).SendAsync("receiveChat", new { userName, message });
+        }
     }
 }

From 42c4ec914c449eca866d41dbde82eb3280cf5a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 15 Jun 2022 16:31:54 +0800
Subject: [PATCH 4/7] =?UTF-8?q?chore=EF=BC=9A=E5=8D=87=E7=BA=A7sqlsugar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/ZR.CodeGenerator.csproj | 2 +-
 ZR.Model/ZR.Model.csproj                 | 2 +-
 ZR.Repository/ZR.Repository.csproj       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZR.CodeGenerator/ZR.CodeGenerator.csproj b/ZR.CodeGenerator/ZR.CodeGenerator.csproj
index 91c2fde..5a66912 100644
--- a/ZR.CodeGenerator/ZR.CodeGenerator.csproj
+++ b/ZR.CodeGenerator/ZR.CodeGenerator.csproj
@@ -12,6 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="JinianNet.JNTemplate" Version="2.3.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
   </ItemGroup>
 </Project>
diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj
index 9650c06..2d1ccec 100644
--- a/ZR.Model/ZR.Model.csproj
+++ b/ZR.Model/ZR.Model.csproj
@@ -7,7 +7,7 @@
   <ItemGroup>
     <PackageReference Include="EPPlus" Version="6.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/ZR.Repository/ZR.Repository.csproj b/ZR.Repository/ZR.Repository.csproj
index 70bc436..2cc6684 100644
--- a/ZR.Repository/ZR.Repository.csproj
+++ b/ZR.Repository/ZR.Repository.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="NETCore.Encrypt" Version="2.1.0" />
     <PackageReference Include="SqlSugar.IOC" Version="1.8.0" />
-    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.8.6" />
+    <PackageReference Include="SqlSugarCoreNoDrive" Version="5.0.9" />
   </ItemGroup>
 
   <ItemGroup>

From d37a1ffbd58617602f729b0a0e738808f25de918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 16 Jun 2022 20:51:18 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat=EF=BC=9A=E8=8F=9C=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=86=85=E9=93=BE=E6=89=93=E5=BC=80=E5=A4=96=E7=BD=91?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/System/UserConstants.cs    |  3 +-
 ZR.Model/System/Vo/RouterVo.cs      | 15 ++++++++-
 ZR.Service/System/SysMenuService.cs | 48 ++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/ZR.Model/System/UserConstants.cs b/ZR.Model/System/UserConstants.cs
index e0906f7..8751269 100644
--- a/ZR.Model/System/UserConstants.cs
+++ b/ZR.Model/System/UserConstants.cs
@@ -56,7 +56,8 @@ namespace ZR.Model.System
         public static string LAYOUT = "Layout";
         /** ParentView组件标识 */
         public static string PARENT_VIEW = "ParentView";
-
+        /** InnerLink组件标识 */
+        public static string INNER_LINK = "InnerLink";
         /** 校验返回结果码 */
         public static string UNIQUE = "0";
         public static string NOT_UNIQUE = "1";
diff --git a/ZR.Model/System/Vo/RouterVo.cs b/ZR.Model/System/Vo/RouterVo.cs
index 9c0140d..b48fa2f 100644
--- a/ZR.Model/System/Vo/RouterVo.cs
+++ b/ZR.Model/System/Vo/RouterVo.cs
@@ -39,19 +39,32 @@ namespace ZR.Model.System.Vo
         /// </summary>
         public bool NoCache { get; set; }
         public string TitleKey { get; set; } = string.Empty;
+        public string Link { get; set; } = string.Empty;
 
+        public Meta(string title, string icon)
+        {
+            Title = title;
+            Icon = icon;
+        }
+        public Meta(string title, string icon, string path)
+        {
+            Title = title;
+            Icon = icon;
+            Link = path;
+        }
         public Meta(string title, string icon, bool noCache)
         {
             Title = title;
             Icon = icon;
             NoCache = noCache;
         }
-        public Meta(string title, string icon, bool noCache, string titleKey)
+        public Meta(string title, string icon, bool noCache, string titleKey, string path)
         {
             Title = title;
             Icon = icon;
             NoCache = noCache;
             TitleKey = titleKey;
+            Link = path;
         }
     }
 }
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index 9154000..e0d4631 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -8,6 +8,7 @@ using ZR.Model.Vo.System;
 using ZR.Repository.System;
 using ZR.Service.System.IService;
 using ZR.Common;
+using Infrastructure.Extensions;
 
 namespace ZR.Service
 {
@@ -281,13 +282,13 @@ namespace ZR.Service
 
             foreach (var menu in menus)
             {
-                RouterVo router = new RouterVo
+                RouterVo router = new()
                 {
                     Hidden = "1".Equals(menu.visible),
                     Name = GetRouteName(menu),
                     Path = GetRoutePath(menu),
                     Component = GetComponent(menu),
-                    Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
+                    Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey, menu.path)
                 };
 
                 List<SysMenu> cMenus = menu.children;
@@ -300,17 +301,32 @@ namespace ZR.Service
                 }
                 else if (IsMeunFrame(menu))
                 {
-                    List<RouterVo> childrenList = new List<RouterVo>();
-                    RouterVo children = new RouterVo
+                    router.Meta = null;
+                    List<RouterVo> childrenList = new();
+                    RouterVo children = new()
                     {
                         Path = menu.path,
                         Component = menu.component,
                         Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
-                        Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
+                        Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey, menu.path)
                     };
                     childrenList.Add(children);
                     router.Children = childrenList;
                 }
+                else if (menu.parentId == 0 && IsInnerLink(menu))
+                {
+                    router.Meta = new Meta(menu.MenuName, menu.icon);
+                    router.Path = "/";
+                    List<RouterVo> childrenList = new();
+                    RouterVo children = new();
+                    string routerPath = InnerLinkReplaceEach(menu.path);
+                    children.Path = routerPath;
+                    children.Component = UserConstants.INNER_LINK;
+                    children.Name = routerPath.ToLower();
+                    children.Meta = new Meta(menu.MenuName, menu.icon, menu.path);
+                    childrenList.Add(children);
+                    router.Children = childrenList;
+                }
                 routers.Add(router);
             }
 
@@ -384,10 +400,10 @@ namespace ZR.Service
         {
             string routerPath = menu.path;
             // 内链打开外网方式
-            //if (menu.parentId != 0 && IsInnerLink(menu))
-            //{
-            //    routerPath = innerLinkReplaceEach(routerPath);
-            //}
+            if (menu.parentId != 0 && IsInnerLink(menu))
+            {
+                routerPath = InnerLinkReplaceEach(routerPath);
+            }
             // 非外链并且是一级目录（类型为目录）
             if (0 == menu.parentId && UserConstants.TYPE_DIR.Equals(menu.menuType)
                 && UserConstants.NO_FRAME.Equals(menu.isFrame))
@@ -413,6 +429,10 @@ namespace ZR.Service
             {
                 component = menu.component;
             }
+            else if (menu.component.IsEmpty() && menu.parentId != 0 && IsInnerLink(menu))
+            {
+                component = UserConstants.INNER_LINK;
+            }
             else if (string.IsNullOrEmpty(menu.component) && IsParentView(menu))
             {
                 component = UserConstants.PARENT_VIEW;
@@ -451,16 +471,16 @@ namespace ZR.Service
         {
             return menu.parentId != 0 && UserConstants.TYPE_DIR.Equals(menu.menuType);
         }
+
         /// <summary>
         /// 内链域名特殊字符替换
         /// </summary>
         /// <param name = "path" ></ param >
         /// < returns ></ returns >
-        //public string innerLinkReplaceEach(string path)
-        //{
-        //    return stringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS },
-        //            new String[] { "", "" });
-        //}
+        public string InnerLinkReplaceEach(string path)
+        {
+            return path.IsNotEmpty() ? path.Replace(UserConstants.HTTP, "").Replace(UserConstants.HTTPS, "") : path;
+        }
         #endregion
 
     }

From ebc44ef9c97a4a7ee8142f0f866195a953208512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 16 Jun 2022 20:39:35 +0800
Subject: [PATCH 6/7] =?UTF-8?q?perf=EF=BC=9A=E8=8F=9C=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysMenuController.cs   | 24 ++++++++++++-------
 ZR.Model/System/Dto/MenuDto.cs                |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
index 2dcd91a..7281ead 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
@@ -123,25 +123,31 @@ namespace ZR.Admin.WebApi.Controllers.System
         /// <summary>
         /// 添加菜单
         /// </summary>
-        /// <param name="MenuDto"></param>
+        /// <param name="menuDto"></param>
         /// <returns></returns>
         [HttpPut("add")]
         [Log(Title = "菜单管理", BusinessType = BusinessType.INSERT)]
         [ActionPermissionFilter(Permission = "system:menu:add")]
-        public IActionResult MenuAdd([FromBody] SysMenu MenuDto)
+        public IActionResult MenuAdd([FromBody] MenuDto menuDto)
         {
-            if (MenuDto == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
-            if (UserConstants.NOT_UNIQUE.Equals(sysMenuService.CheckMenuNameUnique(MenuDto)))
+            var config = new TypeAdapterConfig();
+            //映射规则
+            config.ForType<SysMenu, MenuDto>()
+                .NameMatchingStrategy(NameMatchingStrategy.IgnoreCase);
+            var menu = menuDto.Adapt<SysMenu>(config).ToCreate(HttpContext);
+
+            if (menu == null) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
+            if (UserConstants.NOT_UNIQUE.Equals(sysMenuService.CheckMenuNameUnique(menu)))
             {
-                return ToResponse(ApiResult.Error($"新增菜单'{MenuDto.MenuName}'失败，菜单名称已存在"));
+                return ToResponse(ApiResult.Error($"新增菜单'{menu.MenuName}'失败，菜单名称已存在"));
             }
-            if (UserConstants.YES_FRAME.Equals(MenuDto.isFrame) && !MenuDto.path.StartsWith("http"))
+            if (UserConstants.YES_FRAME.Equals(menu.isFrame) && !menu.path.StartsWith("http"))
             {
-                return ToResponse(ApiResult.Error($"新增菜单'{MenuDto.MenuName}'失败，地址必须以http(s)://开头"));
+                return ToResponse(ApiResult.Error($"新增菜单'{menu.MenuName}'失败，地址必须以http(s)://开头"));
             }
 
-            MenuDto.Create_by = User.Identity.Name;
-            int result = sysMenuService.AddMenu(MenuDto);
+            menu.Create_by = HttpContext.GetName();
+            int result = sysMenuService.AddMenu(menu);
 
             return ToResponse(result);
         }
diff --git a/ZR.Model/System/Dto/MenuDto.cs b/ZR.Model/System/Dto/MenuDto.cs
index 1b7752f..2152c99 100644
--- a/ZR.Model/System/Dto/MenuDto.cs
+++ b/ZR.Model/System/Dto/MenuDto.cs
@@ -14,7 +14,7 @@ namespace ZR.Model.System.Dto
         /// <summary>
         /// 父菜单ID
         /// </summary>
-        public long parentId { get; set; }
+        public long? parentId { get; set; }
 
         /// <summary>
         /// 显示顺序

From 79b501509122630610ed3d6bb1193c9f4755442a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 17 Jun 2022 21:58:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?perf=EF=BC=9A=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/v3/Vue.txt        | 46 +++++++++----------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 26951c8..94ce097 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -8,7 +8,6 @@
 -->
 <template>
   <div>
-    <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
 $foreach(column in genTable.Columns)
 $set(labelName = "")
@@ -41,13 +40,13 @@ $if(column.HtmlType == "datetime")
 $elseif(column.HtmlType == "select" || column.HtmlType == "radio")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
-          <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+          <el-option v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
 $elseif(column.HtmlType == "radio")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-radio-group v-model="queryParams.${columnName}">
-          <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+          <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
         </el-radio-group>
       </el-form-item>
 $else
@@ -136,9 +135,9 @@ $elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.H
       <el-table-column prop="${columnName}" label="${labelName}" align="center"${column.sortStr}>
         <template #default="scope">
 $if(column.HtmlType == "checkbox")
-          <dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
+          <dict-tag :options="$if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
 $else
-          <dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName}" />
+          <dict-tag :options="$if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName}" />
 $end
         </template>
       </el-table-column>
@@ -219,7 +218,7 @@ $elseif(column.HtmlType == "radio")
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-radio-group v-model="form.${columnName}"${column.DisabledStr}>
-                <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
+                <el-radio v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -239,7 +238,7 @@ $elseif(column.HtmlType == "select")
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-select v-model="form.${columnName}" placeholder="请选择${labelName}"${column.DisabledStr}>
-                <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
+                <el-option v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -247,7 +246,7 @@ $elseif(column.HtmlType == "checkbox")
           <el-col :lg="24">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-checkbox-group v-model="form.${columnName}Checked"${column.DisabledStr}>
-                <el-checkbox v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
+                <el-checkbox v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -273,8 +272,7 @@ $end
 
 
 <script setup name="${genTable.BusinessName.ToLower()}">
-import { list${genTable.BusinessName}, add${genTable.BusinessName}, del${genTable.BusinessName}, update${genTable.BusinessName}, get${genTable.BusinessName},
-$if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end $if(showCustomInput) changeSort $end } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
+import { list${genTable.BusinessName}, add${genTable.BusinessName}, del${genTable.BusinessName}, update${genTable.BusinessName}, get${genTable.BusinessName},$if(replaceDto.ShowBtnExport) export${genTable.BusinessName}, $end $if(showCustomInput) changeSort $end } from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
 
 const { proxy } = getCurrentInstance()
 // 选中${replaceDto.FistLowerPk}数组数组
@@ -283,11 +281,8 @@ const ids = ref([])
 const single = ref(true)
 // 非多个禁用
 const multiple = ref(true)
-// 遮罩层
 const loading = ref(false)
-// 显示搜索条件
 const showSearch = ref(true)
-// 查询参数
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
@@ -299,13 +294,11 @@ $if(item.IsQuery == true)
 $end
 $end
 })
-// 弹出层标题
+
 const title = ref("")
-// 操作类型 1、add 2、edit
+// 操作类型 1、add 2、edit 3、view
 const opertype = ref(0)
-// 是否显示弹出层
 const open = ref(false)
-// 表单参数
 const state = reactive({
   form: {},
   rules: {
@@ -314,28 +307,31 @@ $if(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 }],
 $end
+$end
+  },
+  options: {
+$foreach(column in genTable.Columns)
+$if((column.HtmlType == "radio" || column.HtmlType == "select" || column.HtmlType == "checkbox"))
+    // $if(column.ColumnComment != "") ${column.ColumnComment} $else ${column.CsharpFieldFl}$end选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+    $if(column.DictType != "")${column.DictType}$else${column.CsharpFieldFl}Options$end: [],
+$end
 $end
   }
 })
 
-const { form, rules } = toRefs(state)
-// 总记录数
+const { form, rules, options } = toRefs(state)
 const total = ref(0)
 const dataList = ref([])
 const queryRef = ref()
 const formRef = ref()
 $foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
-// ${item.ColumnComment}选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-const $if(item.DictType != "")${item.DictType}$else${item.CsharpFieldFl}Options$end = ref([])
-$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
+$if(item.HtmlType == "datetime" && item.IsQuery == true)
 // ${item.ColumnComment}时间范围
 const dateRange${item.CsharpField} = ref([])
 
 $elseif(item.HtmlType == "customInput")
 // ******************自定义编辑 start **********************
 const editIndex = ref(-1)
-// 动态ref设置值
 const columnRefs = ref([])
 const setColumnsRef = (el) => {
   if (el) {
@@ -381,7 +377,7 @@ $end
 $if(index > 0)
 proxy.getDicts(dictParams).then((response) => {
   response.data.forEach((element) => {
-    proxy[element.dictType] = element.list
+    state.options[element.dictType] = element.list
   })
 })
 $end