From f27f3a1da27ff11e3c12dc1841094a0419a4279a Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 27 九月 2024 10:36:44 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java index 44713a0..d8d4994 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserFallbackFactory.java @@ -5,8 +5,6 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import com.ruoyi.system.api.model.*; -import io.seata.core.exception.TransactionException; -import io.seata.tm.api.GlobalTransactionContext; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; @@ -29,12 +27,6 @@ @Override public R<Boolean> updateSysUser(SysUser sysUser) { - // 手动进行全局事务回滚 - try { - GlobalTransactionContext.getCurrent().rollback(); - } catch (TransactionException e) { - throw new RuntimeException(e); - } return R.fail("更新用户失败:" + cause.getMessage()); } @@ -105,12 +97,6 @@ @Override public R resetPassword(SysUser user) { - // 手动进行全局事务回滚 - try { - GlobalTransactionContext.getCurrent().rollback(); - } catch (TransactionException e) { - throw new RuntimeException(e); - } return R.fail("重置用户密码失败:" + cause.getMessage()); } }; -- Gitblit v1.7.1