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

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<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)) {
                 String message = "演示环境不支持修改数据，请下载源码本地部署体验";
                 AjaxResult<Object> result = AjaxResult.failed(ErrorEnum.NO_PERMISSION.getCode(), message);

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<Admin>().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());

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";