From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 0c77097..011989d 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -17,6 +17,7 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,9 @@
@Resource
private MemberClient MemberClient;
+
+ @Resource
+ private AuctionClient uctionClient;
/**
* 登录
@@ -182,7 +186,7 @@
public AppMiniLoginVO actionMiniLogin(AppMiniLoginDTO appMiniLoginDto)
{
// 查询用户信息
- R<AppMiniLoginVO> userResult = MemberClient.actionMiniLogin(appMiniLoginDto);
+ R<AppMiniLoginVO> userResult = uctionClient.actionMiniLogin(appMiniLoginDto);
if (R.FAIL == userResult.getCode())
{
throw new ServiceException(userResult.getMsg());
--
Gitblit v1.7.1