merge branch 'dev'

mmerge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -256,6 +256,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             userSaveParams.setSchoolId(schoolId);
             SysUser sysUser = gson.fromJson(gson.toJson(userSaveParams), SysUser.class);
             if (Objects.isNull(sysUser.getId())) {//新增用户
+                // 登录名是否唯一
+                QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(SysUser::getLoginName, sysUser.getLoginName());
+                SysUser user = sysUserService.getOne(queryWrapper);
+                if(user != null){
+                    throw ExceptionResultEnum.ERROR.exception("用户名已存在");
+                }
+
                 sysUser.setInsertInfo(requestUser.getId());
                 sysUserService.save(sysUser);
                 for (Long roleId : userSaveParams.getRoleIds()) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/threadPool/MyThreadPool.java

@@ -23,8 +23,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Configuration
 public class MyThreadPool extends ThreadPoolTaskExecutor {
     private final static Logger log = LoggerFactory.getLogger(MyThreadPool.class);
-
-    public MyThreadPool threadPoolTaskExecutor = null;
+    private MyThreadPool threadPoolTaskExecutor = null;
     static final int cpuNum = Runtime.getRuntime().availableProcessors();
 
     @Value("${sys.config.threadPoolCoreSize}")