mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop'

This commit is contained in:
damonyuan 2024-11-21 10:02:57 +08:00
parent fe5b334c2d 3db2182f50
commit 5f5b8f1a86
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java
View File

@ -75,7 +75,7 @@ public class LikeAdminInterceptor implements HandlerInterceptor {
String route = request.getRequestURI().replaceFirst(prefix, ""); String route = request.getRequestURI().replaceFirst(prefix, "");
// String auths = route.replace("/", ":"); // String auths = route.replace("/", ":");
String auths = route; String auths = route;
List<String> ignoreUrl = Arrays.asList("system:login", "system:logout"); List<String> ignoreUrl = Arrays.asList("login/account", "login/logout");
if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) { if (request.getMethod().equals("POST") && !ignoreUrl.contains(auths)) {
String message = "演示环境不支持修改数据，请下载源码本地部署体验"; String message = "演示环境不支持修改数据，请下载源码本地部署体验";
AjaxResult<Object> result = AjaxResult.failed(ErrorEnum.NO_PERMISSION.getCode(), message); AjaxResult<Object> result = AjaxResult.failed(ErrorEnum.NO_PERMISSION.getCode(), message);

6
server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java
View File

@ -351,6 +351,12 @@ public class AdminServiceImpl implements IAdminService {
.ne("id", updateValidate.getId()) .ne("id", updateValidate.getId())
.last("limit 1")), "昵称已存在换一个吧!"); .last("limit 1")), "昵称已存在换一个吧!");
Admin admin = systemAuthAdminMapper.selectOne(new QueryWrapper<Admin>().eq("id", updateValidate.getId()).isNull("delete_time"));
if (admin.getRoot().equals(1) && updateValidate.getDisable().equals(1)) {
throw new OperateException("超级管理员不能设为停用");
}
Admin model = new Admin(); Admin model = new Admin();
model.setId(updateValidate.getId()); model.setId(updateValidate.getId());

2
server/like-common/src/main/java/com/mdd/common/config/GlobalConfig.java
View File

@ -12,7 +12,7 @@ public class GlobalConfig {
public static Boolean isAddressEnabled = false; public static Boolean isAddressEnabled = false;
// 当前代码版本 // 当前代码版本
public static String version = "v1.9.0"; public static String version = "v1.9.1";
// 系统加密字符 // 系统加密字符
public static String secret = "UVTIyzCy"; public static String secret = "UVTIyzCy";