加入版本号

server/src/main/java/com/qmth/jkserver/constant/SystemConstant.java

@@ -74,7 +74,7 @@ public class SystemConstant {
     public static final String ORG_SPLIT = "/";
     public static final String THREAD_POOL_CORE_SIZE = "thread.pool.core.size";
     public static final String CUSTOM_THREAD_POOL_CORE_SIZE = "custom.thread.pool.core.size";
-//    public static final String JKSERVER_SINGLE = "jkserver.single";
+    //    public static final String JKSERVER_SINGLE = "jkserver.single";
     public static final String CLOUDMARK_HOST_URL = "cloudmark.host.url";
     public static final String SYS_CONFIG_KEY_CHARSETS = "sys.txt.charset";
     public final static String SCHOOL_ID = "schoolId";
@@ -359,7 +359,7 @@ public class SystemConstant {
         if (user == null) {
             throw new JkServerException("获取用户信息失败");
         }
-        if (user.getRole() != UserRole.SUPER_ADMIN) {
+        if (!user.getRole().equals(UserRole.SUPER_ADMIN)) {
             throw new JkServerException("只允许超级管理员操作");
         }
     }

server/src/main/java/com/qmth/jkserver/service/impl/UserServiceImpl.java

@@ -158,14 +158,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
 
     @Override
     public void superResetPwd(HttpServletRequest request, String userName, String password, Long schoolId) {
-        String token = request.getHeader(Constants.REQUEST_HEADER_TOKEN);
-        User user = (User) cacheService.getObj(Constants.CACHE_USER + token);
-        if (user == null) {
-            throw new JkServerException(JkServerException.FILED_VALIDATE_ERROR.getCode(), "获取用户信息失败");
-        }
-        if (!user.getRole().equals(UserRole.SUPER_ADMIN)) {
-            throw new JkServerException(JkServerException.FILED_VALIDATE_ERROR.getCode(), "必须是超级管理员才可以操作");
-        }
+        SystemConstant.superOper();
 //        List<User> users = userDao.findByUserName(userName);
         QueryWrapper<User> userQueryWrapper = new QueryWrapper<>();
 //        if (Objects.nonNull(schoolId)) {