From b8f9b07913de4c088d86565c3b331b9263a9027c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index da2ac38..6b128cc 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -3,12 +3,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
-import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import io.seata.spring.annotation.GlobalTransactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -42,15 +39,11 @@
@Resource
private SysUserClient userClient;
- @Resource
- private PartnerClient partnerClient;
-
@PostMapping("login")
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public R<?> login(@RequestBody LoginBody form, HttpServletRequest request) {
// 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), request);
@@ -63,10 +56,6 @@
map.put("roleName",roles.get(0).getRoleName());
map.put("info", userInfo);
- if(userInfo.getSysUser().getRoleType() == 2){
- Partner partner = partnerClient.getPartnerById(userInfo.getSysUser().getObjectId()).getData();
- map.put("partnerName", partner.getName());
- }
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
sysUser.setUserId(userInfo.getSysUser().getUserId());
--
Gitblit v1.7.1