From da5ba0316d6f79d6f6591dfc1642d815f35fcba4 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 23 Aug 2023 22:00:04 +0800 Subject: [PATCH] chore: data time out --- docker-cloud/mysql/conf/my.cnf | 7 ++++--- .../com/cloud/kicc/system/controller/UserController.java | 2 +- .../src/main/resources/mapper/UserMapper.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker-cloud/mysql/conf/my.cnf b/docker-cloud/mysql/conf/my.cnf index 5f4b4c21..5b877164 100644 --- a/docker-cloud/mysql/conf/my.cnf +++ b/docker-cloud/mysql/conf/my.cnf @@ -15,7 +15,8 @@ character-set-server = utf8 default-storage-engine = INNODB max_allowed_packet = 32M lower_case_table_names = 1 - -[mysqldump] -max_allowed_packet = 16M +# 禁止域名解析 +skip-name-resolve = 1 +log_error = /var/log/mysql/error.log +max_allowed_packet = 1024M diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index cf0cb05b..71fe30ad 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -95,7 +95,7 @@ public class UserController { // 设置用户角色信息 if (user != null) { roles = userRoleService.list(new LambdaQueryWrapper().eq(UserRole::getUserId, user.getCasUserId())) - .stream().map(userRole -> userRole.getRoleId()).collect(Collectors.toList()); + .stream().map(UserRole::getRoleId).collect(Collectors.toList()); user.setRoleIds(ArrayUtil.toArray(roles, String.class)); } return R.ok(new ResultVo().setResult(user).setExtend(roleList)); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml index 113390cf..5f4c1659 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml @@ -71,7 +71,7 @@ u.del_flag from sys_user u - left join + inner join remote_cas_sso_user csu on u.cas_user_id = csu.id