add

切换医院功能

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

@@ -119,7 +119,7 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
                     .username(username)
                     .tenantId(wxUser.getLastLoginTenantId())
                     .token(tokenValue)
-                    .loginType(StpUtil.TYPE)
+                    .loginType(LoginTypeConstant.WX_APPLET)
                     .loginIp(wxUser.getLastLoginIp())
                     .loginLocation(cityInfo)
                     .loginTime(loginTime)

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxAppletClinicController.java

@@ -10,7 +10,6 @@ import cn.tr.module.smart.wx.dto.BizClinicAddOrEditDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxAppletClinicShiftCareDTO;
 import cn.tr.module.smart.wx.controller.vo.BizWxAppletClinicVO;
-import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.plugin.mybatis.base.BaseController;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/psw/operator/LoginOAuth2PswUserOperator.java

@@ -15,6 +15,7 @@ import cn.tr.core.utils.PswUtils;
 import cn.tr.core.utils.ServletUtils;
 import cn.tr.module.sys.config.SysConfigManager;
 import cn.tr.module.sys.config.SysConfigProperties;
+import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import cn.tr.module.sys.oauth2.config.CaptchaOperator;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoDTO;
 import cn.tr.module.sys.oauth2.dto.AccountUserInfoEditDTO;
@@ -160,7 +161,7 @@ public class LoginOAuth2PswUserOperator extends AbstractOAuth2PswUserOperator{
                 .username(username)
                 .tenantId(user.getTenantId())
                 .token(tokenValue)
-                .loginType(StpUtil.TYPE)
+                .loginType(LoginTypeConstant.WEB)
                 .loginIp(updateUser.getLastLoginIp())
                 .loginLocation(cityInfo)
                 .loginTime(loginTime)

tr-plugins/tr-spring-boot-starter-plugin-satoken/src/main/java/cn/tr/plugin/security/filter/TrSaTokenFilter.java

@@ -7,6 +7,7 @@ import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.tr.core.utils.ServletUtils;
+import cn.tr.plugin.security.bo.UserLoginInfoBO;
 import cn.tr.plugin.security.constant.SecurityConstant;
 import cn.tr.plugin.security.context.LoginUserContextHolder;
 import org.springframework.web.util.NestedServletException;
@@ -24,8 +25,8 @@ public class TrSaTokenFilter implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         if(StrUtil.isEmpty(LoginUserContextHolder.getStpType())){
-            String stpType = ServletUtils.getHeader(SecurityConstant.STP_TYPE);
-            LoginUserContextHolder.setStpType( StrUtil.isEmpty(stpType)? StpUtil.TYPE:stpType);
+            UserLoginInfoBO user = LoginUserContextHolder.getUser();
+            LoginUserContextHolder.setStpType( StrUtil.isEmpty(user.getLoginType())?StpUtil.TYPE:user.getLoginType());
         }
         try {
             filterChain.doFilter(servletRequest,servletResponse);