From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
index 9583067..f3d4030 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
@@ -1,7 +1,8 @@
package com.ruoyi.system.api.factory;
-import com.ruoyi.system.api.model.AppMiniLoginDto;
-import com.ruoyi.system.api.model.AppMiniLoginVo;
+import com.ruoyi.system.api.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.model.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -9,11 +10,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
/**
* 用户服务
- *
+ *
* @author jqs
*/
@Component
@@ -39,7 +39,10 @@
return R.fail("注册用户失败:" + throwable.getMessage());
}
-
+ @Override
+ public R<QwH5LoginVo> qwH5Login(QwUserDetailDto qwUserDetail) {
+ return R.fail("用户登录:" + throwable.getMessage());
+ }
@Override
public R<SysUser> getSysUser(Long userId) {
@@ -47,7 +50,7 @@
}
@Override
- public R registerUser(SysUser sysUser) {
+ public R<SysUser> registerUser(SysUser sysUser) {
return R.fail("注册用户失败:" + throwable.getMessage());
}
@@ -55,6 +58,16 @@
public R updateUserMobile(SysUser sysUser) {
return R.fail("更新用户手机失败:" + throwable.getMessage());
}
+
+ @Override
+ public R editUserInfo(AppEditUserDto appEditUserDto) {
+ return R.fail("更新用户信息失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R<SysTag> getSysTag(Long sysTagId) {
+ return null;
+ }
};
}
}
--
Gitblit v1.7.1