From 1d429b7c98f8f15c63a6dba03ff90dae7a984e58 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 21 十一月 2024 10:32:33 +0800 Subject: [PATCH] 修改配置文件 --- 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