add:auth方法完善

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/IBizWxUserService.java

@@ -1,9 +1,12 @@
 package cn.tr.module.smart.common.service;
 
+import cn.hutool.core.lang.Pair;
 import cn.tr.module.smart.common.dto.BizWxUserDTO;
 import cn.tr.module.smart.common.dto.BizWxUserQueryDTO;
 import cn.tr.module.smart.common.po.BizWxUserPO;
 import cn.tr.module.smart.wx.controller.vo.BizWxUserBindHospitalVO;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 
 import java.util.*;
 
@@ -66,4 +69,15 @@ public interface IBizWxUserService{
     Boolean shiftTenant(String tenantId);
 
     List<BizWxUserBindHospitalVO> allBindHospital();
+
+    /**
+     * 根据用户名查询用户
+     * @param nickname
+     * @return
+     */
+    BizWxUserPO selectWxUserByNickname(String nickname);
+
+    void updateLastLoginInfo(String id, Date loginTime,String ip,String cityInfo);
+
+
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizWxUserServiceImpl.java

@@ -6,6 +6,7 @@ import cn.tr.core.strategy.LoginUserStrategy;
 import cn.tr.module.smart.common.po.BizWxUserHospitalPO;
 import cn.tr.module.smart.common.repository.BizWxUserHospitalRepository;
 import cn.tr.module.smart.wx.controller.vo.BizWxUserBindHospitalVO;
+import cn.tr.module.sys.user.service.ISysUserService;
 import cn.tr.plugin.security.bo.UserLoginInfoBO;
 import cn.tr.plugin.security.constant.SecurityConstant;
 import cn.tr.plugin.security.context.LoginUserContextHolder;
@@ -38,6 +39,9 @@ public class BizWxUserServiceImpl implements IBizWxUserService {
     @Autowired
     private BizWxUserHospitalRepository wxUserHospitalRepository;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 根据条件查询微信用户
      * @param    query 查询参数
@@ -140,4 +144,21 @@ public class BizWxUserServiceImpl implements IBizWxUserService {
         String userId = LoginUserStrategy.tr.getCurrentUserId();
         return baseRepository.allBindHospital(userId);
     }
+
+    @Override
+    public BizWxUserPO selectWxUserByNickname(String nickname) {
+        LambdaQueryWrapper<BizWxUserPO> queryWrapper = new LambdaQueryWrapper<BizWxUserPO>()
+                .eq(BizWxUserPO::getNickname, nickname);
+        return baseRepository.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void updateLastLoginInfo(String id, Date loginTime, String ip, String cityInfo) {
+        BizWxUserPO  wxUserPO = baseRepository.selectById(id);
+        wxUserPO.setLastLoginIp(ip);
+        wxUserPO.setLastLoginTime(loginTime);
+        wxUserPO.setLastLoginAddress(cityInfo);
+        baseRepository.updateById(wxUserPO);
+        sysUserService.delUserIdAndNickNameCache();
+    }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/config/WxAppletOauth2UserOperator.java

@@ -17,12 +17,14 @@ import cn.tr.core.utils.ServletUtils;
 import cn.tr.module.smart.common.dto.BizWxUserDTO;
 import cn.tr.module.smart.common.po.BizWxUserPO;
 import cn.tr.module.smart.common.service.IBizWxUserService;
+import cn.tr.module.smart.web.dto.WxAppletEncodeInfoDTO;
 import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoDTO;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoEditDTO;
 import cn.tr.module.sys.oauth2.dto.OAuth2PswLoginInfoDTO;
 import cn.tr.module.sys.oauth2.dto.OAuth2PswReqDTO;
 import cn.tr.module.sys.oauth2.psw.operator.AbstractOAuth2PswUserOperator;
+import cn.tr.module.sys.oauth2.psw.operator.LoginOAuth2PswUserOperator;
 import cn.tr.module.sys.user.dto.SysUserDTO;
 import cn.tr.module.sys.user.service.ISysUserService;
 import cn.tr.plugin.security.bo.UserLoginInfoBO;
@@ -30,6 +32,7 @@ import cn.tr.plugin.security.utils.SaTokenUtils;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
@@ -45,6 +48,9 @@ import java.util.Optional;
 @Component
 public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
 
+    @Autowired
+    @Lazy
+    private LoginOAuth2PswUserOperator self;
     @Autowired
     private WxMaService wxMaService;
 
@@ -59,8 +65,16 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
         String appId = source.getAppId();
         String wxAppletCode = source.getWxAppletCode();
         String username = source.getUsername();
-        //对账号进行校验
-        SysUserDTO user = sysUserService.selectUserByUsername(username);
+        Date loginTime = new Date();
+
+
+
+        //获取Request对象
+        HttpServletRequest request = ServletUtils.getRequest();
+        String ip = ServletUtils.getClientIP(request);
+        String cityInfo = IpUtil.getCityInfo(ip);
+
+        //对微信用户表进行查询
         if (!wxMaService.switchover(appId)) {
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appId));
         }
@@ -69,12 +83,11 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
         }
         try {
             WxMaJscode2SessionResult sessionInfo = wxMaService.getUserService().getSessionInfo(wxAppletCode);
+//            WxMaJscode2SessionResult sessionInfo=new WxMaJscode2SessionResult();
+//            sessionInfo.setOpenid("0d3DO5000LXJjU1dib300i6FX31DO50t");
+//            sessionInfo.setUnionid("123");
             String openid = sessionInfo.getOpenid();
-            Date loginTime = new Date();
-            //获取Request对象
-            HttpServletRequest request = ServletUtils.getRequest();
-            String ip = ServletUtils.getClientIP(request);
-            String cityInfo = IpUtil.getCityInfo(ip);
+//            String sessionKey = sessionInfo.getSessionKey();
 
             //根据openid查询用户信息 （通过数据库进行查询）
             BizWxUserDTO wxUser = wxUserService.getUserByOpenidAndAppid(openid,  appId);
@@ -82,11 +95,11 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
                 wxUser = new BizWxUserDTO();
                 wxUser.setOpenId(openid);
                 wxUser.setAppId(appId);
+                wxUser.setNickname(username);
                 wxUser.setRegisterTime(loginTime);
                 wxUser.setLastLoginTime(loginTime);
                 wxUser.setLastLoginIp(ip);
                 wxUser.setLastLoginAddress(cityInfo);
-                wxUser.setLastLoginTenantId(user.getTenantId());
                 if (StrUtil.isNotBlank(sessionInfo.getUnionid())){
                     wxUser.setUnionId(sessionInfo.getUnionid());
                 }
@@ -96,16 +109,19 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
             StpLogic stpUtil = SaTokenUtils.getStpUtil();
             stpUtil.login(wxUser.getId());
             String tokenValue = stpUtil.getTokenValue();
+            wxUserService.updateLastLoginInfo(wxUser.getId(),loginTime,ip,cityInfo);
+            //清除缓存
+            self.delUserLoginInfoCache(wxUser.getId());
 
             UserAgent userAgent = Optional.ofNullable(UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"))).orElse(new UserAgent());
             String browser = ObjectUtil.isEmpty(userAgent.getBrowser()) ? "未知" : userAgent.getBrowser().getName();
             String os = ObjectUtil.isEmpty(userAgent.getOs()) ? "未知" : userAgent.getOs().getName();
 
             UserLoginInfoBO loginInfo = UserLoginInfoBO.builder()
-                    .userId(user.getId())
-                    .nickname(user.getNickname())
+                    .userId(wxUser.getId())
+                    .nickname(wxUser.getNickname())
                     .username(username)
-                    .tenantId(user.getTenantId())
+                    .tenantId(wxUser.getLastLoginTenantId())
                     .token(tokenValue)
                     .loginType(StpUtil.TYPE)
                     .loginIp(wxUser.getLastLoginIp())
@@ -113,14 +129,14 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
                     .loginTime(loginTime)
                     .browser(browser)
                     .os(os)
-                    .orgId(user.getOrgId())
-                    .signature(user.getSignature())
+                    .orgId("")
+                    .signature("")
                     .build();
             setSessionUser(tokenValue,loginInfo);
             return tokenValue;
 
-        } catch (WxErrorException e) {
-            throw new ServiceException(TRExcCode.WX_LOGIN_FAIL, "微信登录失败：" + e.getError().getErrorMsg());
+        } catch (Exception e) {
+            throw new ServiceException(TRExcCode.WX_LOGIN_FAIL, "微信登录失败：" + e.getMessage());
         }
 
     }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswReqDTO.java

@@ -1,15 +1,7 @@
 package cn.tr.module.sys.oauth2.dto;
-
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-
 /**
  * oauth认证参数
  *
@@ -24,7 +16,7 @@ public class OAuth2PswReqDTO extends OAuth2DTO {
 	private String username;
 
 	@ApiModelProperty(value = "授权范围，可传空字符串")
-	private String grant_type="";
+	private String grant_type = "";
 
 
 	@ApiModelProperty(value = "密码")