Browse Source

chore: data time out

master
wangxiang 2 years ago
parent
commit
da5ba0316d
No known key found for this signature in database
GPG Key ID: 1BA7946AB6B232E4
  1. 7
      docker-cloud/mysql/conf/my.cnf
  2. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java
  3. 2
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

7
docker-cloud/mysql/conf/my.cnf

@ -15,7 +15,8 @@ character-set-server = utf8
default-storage-engine = INNODB default-storage-engine = INNODB
max_allowed_packet = 32M max_allowed_packet = 32M
lower_case_table_names = 1 lower_case_table_names = 1
# 禁止域名解析
[mysqldump] skip-name-resolve = 1
max_allowed_packet = 16M log_error = /var/log/mysql/error.log
max_allowed_packet = 1024M

2
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) { if (user != null) {
roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId())) roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().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)); user.setRoleIds(ArrayUtil.toArray(roles, String.class));
} }
return R.ok(new ResultVo().setResult(user).setExtend(roleList)); return R.ok(new ResultVo().setResult(user).setExtend(roleList));

2
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/UserMapper.xml

@ -71,7 +71,7 @@
u.del_flag u.del_flag
from from
sys_user u sys_user u
left join inner join
remote_cas_sso_user csu remote_cas_sso_user csu
on u.cas_user_id = csu.id on u.cas_user_id = csu.id
<where> <where>

Loading…
Cancel
Save