From 48c153c4c77f5499978c8e3af1050b0984fb6fdb Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Tue, 19 Nov 2024 22:25:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=81=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/admin/service/impl/admin/AdminServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java index cc0edc6f..873ca3eb 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java @@ -351,6 +351,12 @@ public class AdminServiceImpl implements IAdminService { .ne("id", updateValidate.getId()) .last("limit 1")), "昵称已存在换一个吧!"); + Admin admin = systemAuthAdminMapper.selectOne(new QueryWrapper().eq("id", updateValidate.getId()).isNull("delete_time")); + + if (admin.getRoot().equals(1) && updateValidate.getDisable().equals(1)) { + throw new OperateException("超级管理员不能设为停用"); + } + Admin model = new Admin(); model.setId(updateValidate.getId()); From 2c527a9e33d69d8bd606da36d979a01e872a0d4f Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Wed, 20 Nov 2024 23:16:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E6=BC=94=E7=A4=BA=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=BA=E9=9C=80=E8=A6=81=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/admin/LikeAdminInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java index cbf0ee81..760cb598 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java @@ -75,7 +75,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor { String route = request.getRequestURI().replaceFirst(prefix, ""); // String auths = route.replace("/", ":"); String auths = route; - List ignoreUrl = Arrays.asList("system:login", "system:logout"); + List ignoreUrl = Arrays.asList("login/account", "login/logout"); if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) { String message = "演示环境不支持修改数据，请下载源码本地部署体验"; AjaxResult result = AjaxResult.failed(ErrorEnum.NO_PERMISSION.getCode(), message); From 3db2182f5015540d36d1f5c9812d6d7aafd58af7 Mon Sep 17 00:00:00 2001 From: damonyuan <404054358@qq.com> Date: Thu, 21 Nov 2024 09:52:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?1.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mdd/common/config/GlobalConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java index b197b864..7c82888c 100644 --- a/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java +++ b/server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java @@ -12,7 +12,7 @@ public class GlobalConfig { public static Boolean isAddressEnabled = false; // 当前代码版本 - public static String version = "v1.9.0"; + public static String version = "v1.9.1"; // 系统加密字符 public static String secret = "UVTIyzCy";