From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
index a8ab6b2..d00fb80 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java
@@ -7,8 +7,6 @@
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.PointChangeDto;
-import io.seata.core.exception.TransactionException;
-import io.seata.tm.api.GlobalTransactionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -38,12 +36,6 @@
@Override
public R<TAppUser> getUserById(Long id) {
- // 手动进行全局事务回滚
- try {
- GlobalTransactionContext.getCurrent().rollback();
- } catch (TransactionException e) {
- throw new RuntimeException(e);
- }
return R.fail("根据id查询用户失败:"+throwable.getMessage());
}
@@ -93,6 +85,12 @@
public R<TAppUserAddress> getAddressById(Long id) {
return R.fail("通过地址id `查询用户地址失败:"+throwable.getMessage());
}
+
+
+ @Override
+ public R<String> getWXToken() {
+ return R.fail("获取微信token失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1