From ebe149fdd9267fb783044feae757ad62dabbc860 Mon Sep 17 00:00:00 2001 From: mycode99 <661753@qq.com> Date: Sat, 29 Mar 2025 16:12:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Admin.NET/Admin.NET.We?= =?UTF-8?q?b.Entry/wwwroot/template/service=5FMid.cs.vm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正缓存BUG --- .../Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm index 7d44eefd..697ec0d1 100644 --- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Mid.cs.vm @@ -87,7 +87,7 @@ public partial class @(@Model.ClassName)Mid @: var key = $"@(@column.FkEntityName)_{t.@(@column.PropertyName)}"; @: if (!sysCacheService.ExistKey(key)) @: { - @: var m = db.ForTenant<@(@column.FkEntityName)>().Queryable<@(@column.FkEntityName)>().FirstAsync(f => f.@(@column.FkLinkColumnName) == t.@(@column.PropertyName)); + @: var m = db.ForTenant<@(@column.FkEntityName)>().Queryable<@(@column.FkEntityName)>().First(f => f.@(@column.FkLinkColumnName) == t.@(@column.PropertyName)); @: if (m != null) sysCacheService.Set(key, m); @: } @: t.@(@column.PropertyName)@(@column.FkColumnName) = sysCacheService.Get<@(@column.FkEntityName)>(key)?.@(@column.FkColumnName); From 8b7313208a79ef3cf0fb41ad40dfad057a112c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=99=E6=84=8F?= Date: Sun, 30 Mar 2025 16:08:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/system/user/component/userCenter.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Web/src/views/system/user/component/userCenter.vue b/Web/src/views/system/user/component/userCenter.vue index e1a2c132..1c772733 100644 --- a/Web/src/views/system/user/component/userCenter.vue +++ b/Web/src/views/system/user/component/userCenter.vue @@ -322,14 +322,15 @@ const submitPassword = () => { cpwd.passwordNew = sm2.doEncrypt(state.ruleFormPassword.passwordNew, publicKey, 1); await getAPI(SysUserApi).apiSysUserChangePwdPost(cpwd); - // 退出系统 - ElMessageBox.confirm(t('message.list.passwordModifiedConfirmRelogin'), t('message.list.hint'), { - confirmButtonText: t('message.list.confirmButtonText'), - cancelButtonText: t('message.list.cancelButtonText'), - type: 'warning', - }).then(async () => { - clearAccessTokens(); - }); + // 修改密码后后端会强制下线，无需弹出确认重新登录提示 + // // 退出系统 + // ElMessageBox.confirm(t('message.list.passwordModifiedConfirmRelogin'), t('message.list.hint'), { + // confirmButtonText: t('message.list.confirmButtonText'), + // cancelButtonText: t('message.list.cancelButtonText'), + // type: 'warning', + // }).then(async () => { + // clearAccessTokens(); + // }); }); }; From 2daf4b6b720e54c0915e85e8f36f4c17920ea7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=99=E6=84=8F?= Date: Sun, 30 Mar 2025 16:27:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=A7=9F=E6=88=B7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=BD=93=E5=9B=BE=E6=A0=87=E6=B2=A1=E5=8F=98=E6=9B=B4=E6=97=B6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E5=9B=BE=E6=A0=87=E6=B2=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs index aa2f11a3..eb193f98 100644 --- a/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs +++ b/Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs @@ -359,7 +359,8 @@ public class SysTenantService : IDynamicApiController, ITransient await _sysOrgRep.UpdateAsync(u => new SysOrg() { Name = input.Name, Pid = input.OrgPid }, u => u.Id == input.OrgId); // 更新系统用户 - await _sysUserRep.UpdateAsync(u => new SysUser() { Account = input.AdminAccount, RealName = input.RealName, Phone = input.Phone, Email = input.Email }, u => u.Id == input.UserId); + await _sysUserRep.UpdateAsync(u => new SysUser() { Account = input.AdminAccount, RealName = input.RealName, Phone = input.Phone, Email = input.Email }, + u => u.Id == input.UserId); await CacheTenant(input.Id); @@ -627,6 +628,7 @@ public class SysTenantService : IDynamicApiController, ITransient var tenant = await _sysTenantRep.GetFirstAsync(u => u.Id == input.TenantId); _ = tenant ?? throw Oops.Oh(ErrorCodeEnum.D1002); + var originLogo = tenant.Logo; tenant = input.Adapt(); tenant.Id = input.TenantId; @@ -665,7 +667,7 @@ public class SysTenantService : IDynamicApiController, ITransient } else { - tenant.Logo = tenant.Logo; + tenant.Logo = originLogo; } await _sysTenantRep.AsUpdateable(tenant).UpdateColumns(u => new From 600666ffd0476eafe2c80564ca50990b157a2498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=99=E6=84=8F?= Date: Sun, 30 Mar 2025 17:13:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20vxeTable=20Hook=20=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=20PagerConfig=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 默认的每页20，没有在全局中注册 --- Web/src/hooks/useVxeTableOptionsHook.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/src/hooks/useVxeTableOptionsHook.ts b/Web/src/hooks/useVxeTableOptionsHook.ts index 1eb7ea15..efcf1c2b 100644 --- a/Web/src/hooks/useVxeTableOptionsHook.ts +++ b/Web/src/hooks/useVxeTableOptionsHook.ts @@ -68,7 +68,7 @@ export const useVxeTable = (opt: iVxeOption, extras?: VxeGridProps) => { pagerConfig: { enabled: true, size: vxeSize, - pageSize: 20, + pageSize: 50, }, printConfig: { sheetName: '' }, // proxyConfig: {