From 11b6cfb2d3312b018b68eecadc798dfa3e2ec6db Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 05 十一月 2024 14:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserFallbackFactory.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 5c3fc3f..b4cd200 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
@@ -1,6 +1,7 @@
 package com.ruoyi.account.api.factory;
 
 import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.dto.SendMessageDTO;
 import com.ruoyi.account.api.feignClient.AppUserClient;
 import com.ruoyi.account.api.model.TAppCoupon;
 import com.ruoyi.account.api.model.TAppUser;
@@ -36,7 +37,7 @@
     
             @Override
             public R<TAppUser> getUserById(Long id) {
-                throw new RuntimeException("根据id查询用户失败:"+throwable.getMessage());
+                return R.fail("根据id查询用户失败:"+throwable.getMessage());
             }
 
             @Override
@@ -49,10 +50,7 @@
                 return R.fail("修改用户失败:"+throwable.getMessage());
             }
 
-            @Override
-            public R change(PointChangeDto points) {
-                return null;
-            }
+
 
             @Override
             public R changeDown(PointChangeDto points) {
@@ -88,6 +86,23 @@
             public R<TAppUserAddress> getAddressById(Long id) {
                 return R.fail("通过地址id `查询用户地址失败:"+throwable.getMessage());
             }
+    
+    
+            @Override
+            public R<String> getWXToken() {
+                return R.fail("获取微信token失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> sensitiveWordDetection(String content, String openid) {
+                return R.fail("敏感词校验失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<String> sendMessage(SendMessageDTO sendMessageDTO) {
+                return R.fail("短信发送失败:" + throwable.getMessage());
+            }
+
         };
     }
 }

--
Gitblit v1.7.1