From c63a72a68bc6739f3617a00bc15a187b59f06bae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 15:53:21 +0800
Subject: [PATCH] 1、解决引入milo-spring-boot-starter依赖系统无法启动异常 2、opc服务可配置开关服务，避免无opc环境下系统启动报错 3、删除无用的opc代码
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index 144ecd6..1e4a478 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -19,6 +19,7 @@
import com.mes.userinfo.entity.SysUserRole;
import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.mapper.SysUserMapper;
+import com.mes.userinfo.mapper.SysUserRoleMapper;
import com.mes.userinfo.service.SysUserRoleService;
import com.mes.userinfo.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
@@ -71,13 +72,11 @@
@Resource
BCryptPasswordEncoder passwordEncoder;
-
- @Value("${test.common}")
- private String value;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
@Override
public Map<String, String> login(SysUser user) {
- log.info(value);
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(user.getUserName(), user.getPassword());
Authentication authenticate = authenticationManager.authenticate(authenticationToken);
if (Objects.isNull(authenticate)) {
@@ -129,10 +128,12 @@
this.updateById(sysUser);
log.info("鍒犻櫎鐢ㄦ埛瑙掕壊淇℃伅");
List<Long> roleIds = user.getRoleList().stream().map(SysRole::getId).collect(Collectors.toList());
- sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
- .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
- log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
- saveUserRole(user.getRoleList(), sysUser.getId());
+// sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
+// .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
+ SysUserRole sysUserRole = new SysUserRole(sysUser.getId(),roleIds.get(0));
+ sysUserRoleMapper.updateById(sysUserRole);
+// log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+// saveUserRole(user.getRoleList(), sysUser.getId());
return user;
}
--
Gitblit v1.8.0