From d3d4b231cf070860cb37c3eb921f1b911e3d5d21 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Thu, 7 Mar 2024 15:21:26 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix=20:=20=E8=B7=AF=E7=94=B1=E5=85=B3?= =?UTF-8?q?=E9=94=AEkey=E6=94=B9=E4=B8=BA=E7=99=BB=E5=BD=95uuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/impl/OnlineUserServiceImpl.java | 1 + .../admin/service/impl/UserServiceImpl.java | 1 + .../auth/service/impl/LoginServiceImpl.java | 15 ++++++++++----- .../common/core/constant/CacheConstants.java | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java index e502d9c..2ecbef1 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java @@ -72,6 +72,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { @Override public void force(String tokenId) { redisTemplate.delete(CacheConstants.LOGIN_TOKEN_KEY + tokenId); + redisTemplate.delete(CacheConstants.ROUTE_CACHE_KEY + tokenId); } private OnlineUser toOnlineUser(LoginUser user) { diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java index 5a1571d..4036c19 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java @@ -307,6 +307,7 @@ public class UserServiceImpl implements UserService { batchUserPost(dto, Boolean.TRUE); dto.setPassword(null); UserBase user = dto.toUser(); + return userMapper.update(user); } diff --git a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java index eb5ee91..e89241a 100644 --- a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java +++ b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java @@ -31,6 +31,7 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; @@ -95,7 +96,7 @@ public class LoginServiceImpl implements LoginService { throw new CustomException("验证码错误!"); } redisTemplate.delete(uuid); - //用户验证 + //用户验证 Authentication authentication = null; try { // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername @@ -156,11 +157,15 @@ public class LoginServiceImpl implements LoginService { @Override public List getMenuRouterByUserId() { - List result = (List) redisTemplate.opsForValue().get(CacheConstants.ROUTE_CACHE_KEY + SecurityUtils.getUserId()); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (ObjectUtils.isEmpty(loginUser)){ + throw new CustomException("获取用户信息失败!"); + } + List result = (List) redisTemplate.opsForValue().get(CacheConstants.ROUTE_CACHE_KEY + loginUser.getUuid()); if (result == null || result.isEmpty()) { - RLock lock = redissonClient.getLock(CacheConstants.ROUTE_CACHE_KEY + "lock:" + SecurityUtils.getUserId()); + RLock lock = redissonClient.getLock(CacheConstants.ROUTE_CACHE_KEY + "lock:" + loginUser.getUuid()); try { - result = (List) redisTemplate.opsForValue().get(CacheConstants.ROUTE_CACHE_KEY + SecurityUtils.getUserId()); + result = (List) redisTemplate.opsForValue().get(CacheConstants.ROUTE_CACHE_KEY + loginUser.getUuid()); if (result == null || result.isEmpty()) { result = menuService.selectMenuRouterByUserId(SecurityUtils.getUserId()); if (result == null || result.isEmpty()) { @@ -168,7 +173,7 @@ public class LoginServiceImpl implements LoginService { // throw new CustomException("获取路由异常!"); return new ArrayList<>(); } - redisTemplate.opsForValue().set(CacheConstants.ROUTE_CACHE_KEY + SecurityUtils.getUserId(),result,30, TimeUnit.MINUTES); + redisTemplate.opsForValue().set(CacheConstants.ROUTE_CACHE_KEY + loginUser.getUuid(), result, 30, TimeUnit.MINUTES); } } finally { if (lock.isLocked() && lock.isHeldByCurrentThread()) { diff --git a/common/common-core/src/main/java/cn/fateverse/common/core/constant/CacheConstants.java b/common/common-core/src/main/java/cn/fateverse/common/core/constant/CacheConstants.java index da569d4..bd13717 100644 --- a/common/common-core/src/main/java/cn/fateverse/common/core/constant/CacheConstants.java +++ b/common/common-core/src/main/java/cn/fateverse/common/core/constant/CacheConstants.java @@ -14,7 +14,7 @@ public class CacheConstants { /** * 路由缓存地址 */ - public static final String ROUTE_CACHE_KEY = "router_key:"; + public static final String ROUTE_CACHE_KEY = "router:key:"; /** * 登录用户 redis key */ From c6928f1f01bcca6e028ce1d8222275b73f7a412d Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 19:24:44 +0800 Subject: [PATCH 02/12] =?UTF-8?q?fix=20:=20=E9=9D=9E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/MenuController.java | 3 +- .../admin/controller/UserController.java | 4 +- .../service/impl/OnlineUserServiceImpl.java | 12 ++++-- .../src/main/resources/mapper/MenuMapper.xml | 37 ++++++++++++++++--- .../auth/service/impl/LoginServiceImpl.java | 22 +++++------ .../common/security/service/TokenService.java | 1 + 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java index 5ad6311..89ddf41 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/MenuController.java @@ -70,8 +70,9 @@ public class MenuController { return Result.ok(optionMenuVo); } - @ApiOperation("获取树形接口的option") + @ApiOperation("菜单详情") @GetMapping("/info/{menuId}") + @PreAuthorize("@ss.hasPermission('admin:menu:info')") public Result info(@PathVariable Long menuId) { ObjectUtils.checkPk(menuId); MenuVo menu = menuService.searchByMenuId(menuId); diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java index a8cb041..c4e3418 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/controller/UserController.java @@ -76,7 +76,7 @@ public class UserController { return Result.ok(userChooseList); } - @ApiOperation("获取用户列表") + @ApiOperation("获取用户详情") @GetMapping("/info/{userId}") @PreAuthorize("@ss.hasPermission('admin:user:info')") public Result info(@PathVariable Long userId) { @@ -200,7 +200,7 @@ public class UserController { } - @ApiOperation("建立角色用户绑定关系") + @ApiOperation("建立岗位用户绑定关系") @PutMapping("/bind/post") @PreAuthorize("@ss.hasPermission('admin:user:bindPost')") @Log(title = "建立角色用户绑定关系", businessType = BusinessType.UPDATE) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java index 2ecbef1..fff6f7e 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/OnlineUserServiceImpl.java @@ -1,5 +1,6 @@ package cn.fateverse.admin.service.impl; +import cn.fateverse.admin.entity.Dept; import cn.fateverse.common.core.entity.PageInfo; import cn.fateverse.common.core.result.page.TableDataInfo; import cn.fateverse.common.core.utils.TableSupport; @@ -35,7 +36,7 @@ public class OnlineUserServiceImpl implements OnlineUserService { * todo 现阶段一次性将所有用户全部返回,后期想办法进行分页操作 * * @param place - * @param username + * @param username 用户名 * @return */ @Override @@ -76,16 +77,21 @@ public class OnlineUserServiceImpl implements OnlineUserService { } private OnlineUser toOnlineUser(LoginUser user) { - return OnlineUser.builder() + OnlineUser onlineUser = OnlineUser.builder() .tokenId(user.getUuid()) .username(user.getUsername()) - .deptName(user.getUser().getDept().getDeptName()) .ipAddr(user.getIpddr()) .loginLocation(user.getLoginLocation()) .browser(user.getBrowser()) .os(user.getOs()) .loginTime(new Date(user.getLoginTime())) .build(); + + Dept dept = user.getUser().getDept(); + if (dept != null) { + onlineUser.setDeptName(dept.getDeptName()); + } + return onlineUser; } diff --git a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml index 47cb8ff..7971be4 100644 --- a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml +++ b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml @@ -61,13 +61,38 @@ diff --git a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java index e89241a..f71b489 100644 --- a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java +++ b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java @@ -85,17 +85,17 @@ public class LoginServiceImpl implements LoginService { @Override public String login(LoginBody login) { log.info("用户:{},于:{}登录系统", login.getUsername(), DateUtil.format(new Date(), DateConstants.YYYY_MM_DD_HH_MM_SS)); - String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); - String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); - if (null == code) { - publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); - throw new CustomException("验证码已过期!"); - } - if (!code.equals(login.getCode())) { - publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); - throw new CustomException("验证码错误!"); - } - redisTemplate.delete(uuid); +// String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); +// String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); +// if (null == code) { +// publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); +// throw new CustomException("验证码已过期!"); +// } +// if (!code.equals(login.getCode())) { +// publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); +// throw new CustomException("验证码错误!"); +// } +// redisTemplate.delete(uuid); //用户验证 Authentication authentication = null; try { diff --git a/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java b/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java index b8f70e7..d837632 100644 --- a/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java +++ b/common/common-security/src/main/java/cn/fateverse/common/security/service/TokenService.java @@ -118,6 +118,7 @@ public class TokenService { if (!StrUtil.isEmpty(token)) { String userKey = getTokenKey(token); redisTemplate.delete(userKey); + redisTemplate.delete(CacheConstants.ROUTE_CACHE_KEY + token); } } From 77f1a5eb6342e3898d6dd2c534b70de7d403a526 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 20:05:47 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix=20:=20=E9=9D=9E=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/admin-biz/src/main/resources/mapper/MenuMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml index 7971be4..ae9b968 100644 --- a/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml +++ b/admin/admin-biz/src/main/resources/mapper/MenuMapper.xml @@ -88,7 +88,7 @@ left join sys_role r on r.role_id = rm.role_id left join sys_user_role ur on ur.role_id = r.role_id - and ur.role_id = #{userId} + and ur.user_id = #{userId} and m.menu_name like concat('%',#{menuName},'%') and m.state = #{state} and m.menu_id != #{excludeId} and parent_id != #{excludeId} From 5b159328598410216eccb09eedf542890b90f393 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 20:42:15 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat=20:=20=E6=B8=85=E9=99=A4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/LoginServiceImpl.java | 24 +++++++------- .../common/log/aspect/LogAspect.java | 2 +- .../notice/config/RedisTemplateConfig.java | 31 ------------------- 3 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java diff --git a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java index f71b489..bfd8e1c 100644 --- a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java +++ b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java @@ -85,18 +85,18 @@ public class LoginServiceImpl implements LoginService { @Override public String login(LoginBody login) { log.info("用户:{},于:{}登录系统", login.getUsername(), DateUtil.format(new Date(), DateConstants.YYYY_MM_DD_HH_MM_SS)); -// String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); -// String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); -// if (null == code) { -// publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); -// throw new CustomException("验证码已过期!"); -// } -// if (!code.equals(login.getCode())) { -// publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); -// throw new CustomException("验证码错误!"); -// } -// redisTemplate.delete(uuid); - //用户验证 + String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); + String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); + if (null == code) { + publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); + throw new CustomException("验证码已过期!"); + } + if (!code.equals(login.getCode())) { + publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); + throw new CustomException("验证码错误!"); + } + redisTemplate.delete(uuid); + //用户验证 Authentication authentication = null; try { // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername diff --git a/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java b/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java index 8986fd8..cd1a62d 100644 --- a/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java +++ b/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java @@ -47,7 +47,7 @@ public class LogAspect { @Around("@within(log) || @annotation(log)") - public Object before(ProceedingJoinPoint point, Log log) throws Throwable { + public Object around(ProceedingJoinPoint point, Log log) throws Throwable { long startTime = System.currentTimeMillis(); try { Object proceed = point.proceed(point.getArgs()); diff --git a/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java b/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java deleted file mode 100644 index 4656a82..0000000 --- a/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.fateverse.notice.config; - -import cn.fateverse.notice.entity.UserInfo; -import org.redisson.spring.data.connection.RedissonConnectionFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -/** - * @author Clay - * @date 2023-10-15 - */ -//@Configuration -public class RedisTemplateConfig { - - - @Bean("noticeRedisTemplate") - public RedisTemplate noticeRedisTemplate(RedissonConnectionFactory redissonConnectionFactory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - redisTemplate.setConnectionFactory(redissonConnectionFactory); - //设置key序列化方式string - redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.setHashKeySerializer(new StringRedisSerializer()); - redisTemplate.afterPropertiesSet(); - return redisTemplate; - } - - - -} From 27ead40bb36893cd3e10700e1ae3394a0f87b5d4 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 21:30:22 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat=20:=20IpBack.java=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/entity/IpBack.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java new file mode 100644 index 0000000..b0aa6e4 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java @@ -0,0 +1,38 @@ +package cn.fateverse.admin.entity; + +import cn.fateverse.admin.vo.IpBackVo; +import cn.fateverse.common.core.annotaion.EnableAutoField; +import cn.fateverse.common.core.entity.BaseEntity; +import lombok.Data; + +/** + * @author Clay + * @date 2023-10-22 + */ +@Data +@EnableAutoField +public class IpBack extends BaseEntity { + /** + * 主键id + */ + private Long id; + /** + * ip地址 + */ + private String ipAddr; + /** + * ip类型 ipv4 ipv6 + */ + private String type; + + public IpBackVo toIPBackVo(){ + return IpBackVo.builder() + .id(id) + .ipAddr(ipAddr) + .type(type) + .createTime(getCreateTime()) + .remark(getRemark()) + .build(); + } + +} From c0e7c5b3495280c890082ea796902c087c1f3f19 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Sat, 9 Mar 2024 13:59:00 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix=20:=20=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/entity/vo/MappingSwitchVo.java | 8 ++++++-- .../cn/fateverse/admin/service/impl/UserServiceImpl.java | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java index ebb3ae7..721421f 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java @@ -87,19 +87,23 @@ public class MappingSwitchVo { private String operName; public static MappingSwitchVo toMappingSwitchVo(MappingSwitchInfo mappingSwitchInfo) { - return MappingSwitchVo.builder() + MappingSwitchVo mappingSwitchVo = MappingSwitchVo.builder() .key(mappingSwitchInfo.getKey()) .applicationName(mappingSwitchInfo.getApplicationName()) .className(mappingSwitchInfo.getClassName()) .description(mappingSwitchInfo.getDescription()) .methodName(mappingSwitchInfo.getMethodName()) .uris(mappingSwitchInfo.getUris()) - .type(mappingSwitchInfo.getType().toString()) .httpMethods(mappingSwitchInfo.getHttpMethods()) .state(mappingSwitchInfo.getState()) .operName(mappingSwitchInfo.getOperName()) .operTime(mappingSwitchInfo.getOperTime()) .build(); + MappingSwitchInfo.MappingSwitchType switchType = mappingSwitchInfo.getType(); + if (switchType != null) { + mappingSwitchVo.setType(switchType.name()); + } + return mappingSwitchVo; } diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java index 4036c19..5a1571d 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java @@ -307,7 +307,6 @@ public class UserServiceImpl implements UserService { batchUserPost(dto, Boolean.TRUE); dto.setPassword(null); UserBase user = dto.toUser(); - return userMapper.update(user); } From 16311cf968c63f6c3238317c82f9db78eed5a0f6 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Tue, 12 Mar 2024 11:45:30 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix=20:=20=E5=85=B3=E4=BA=8E=E6=88=91?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/src/main/resources/mapper/UserInstanceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml b/visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml index a9cdaa5..c00e32d 100644 --- a/visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml +++ b/visual/workflow/src/main/resources/mapper/UserInstanceMapper.xml @@ -41,7 +41,7 @@ - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, - oper_ip, oper_location, state, oper_time, consume_time - from sys_operation_log + oper_id >= (select oper_id from sys_operation_log and title like concat('%',#{operation.title},'%') + + and application_name like concat('%',#{operation.applicationName},'%') + and oper_name like concat('%',#{operation.operName},'%') @@ -71,6 +93,9 @@ and title like concat('%',#{operation.title},'%') + + and application_name like concat('%',#{operation.applicationName},'%') + and oper_name like concat('%',#{operation.operName},'%') @@ -93,13 +118,14 @@ select oper_id, title, + application_name, business_type, method, request_method, diff --git a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java b/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java index 40d3be4..dc0b42b 100644 --- a/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java +++ b/visual/workflow/src/main/java/cn/fateverse/workflow/entity/dto/ProcessListenerDto.java @@ -1,7 +1,7 @@ package cn.fateverse.workflow.entity.dto; import cn.fateverse.workflow.entity.ProcessListener; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; From dfd58e0e178f0e4c50b3b8ce7412e7cdd72ea810 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Mon, 25 Mar 2024 17:46:14 +0800 Subject: [PATCH 11/12] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9drone?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 45f7168..0a1d109 100644 --- a/.drone.yml +++ b/.drone.yml @@ -96,10 +96,7 @@ trigger: - code-gen - custom-query - sentinel-dashboard - - sentinel-dashboard-pro - - code-gen-test-mysql - workflow - - flowable event: - push \ No newline at end of file From 471f9ebdff22d4e75fd1f96394a7fc691b7a1cf8 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Mon, 25 Mar 2024 18:07:20 +0800 Subject: [PATCH 12/12] =?UTF-8?q?build=20:=20dubbo=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=94=B9=E4=B8=BA3.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/common-dubbo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common-dubbo/pom.xml b/common/common-dubbo/pom.xml index 16bfced..50a654f 100644 --- a/common/common-dubbo/pom.xml +++ b/common/common-dubbo/pom.xml @@ -12,7 +12,7 @@ common-dubbo - 3.2.0 + 3.2.1 UTF-8