Merge branch 'V20240319三方平台登录改造' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20240319三方平台登录改造' of http://192.168.60.201/root/dsk-operate-sys into V20240319三方平台登录改造

dsk-admin/src/main/java/com/dsk/web/controller/system/SysLoginController.java

@@ -6,7 +6,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.RegexPool;
 import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
 import com.dsk.common.constant.Constants;
 import com.dsk.common.constant.GlobalConstants;
@@ -32,7 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,12 +80,7 @@ public class SysLoginController {
     @PostMapping("/thirdPlatformLogin")
     public R<LoginVo> thirdPlatformLogin(@Validated @RequestBody ThirdPlatformLoginBody tpLoginBody, HttpServletRequest request) {
         String ipAddr = IpUtil.getIpAddr(request);
-        LoginVo loginVo = loginService.thirdPlatformLogin(tpLoginBody, ipAddr);
-
-        //设置三方登录标识
-        RedisUtils.setCacheObject(GlobalConstants.SOCIAL_AUTH_CODE_KEY + loginVo.getTenantId(), loginVo.getTenantId(), Duration.ofMinutes(5));
-
-        return R.ok(loginVo);
+        return R.ok(loginService.thirdPlatformLogin(tpLoginBody, ipAddr));
     }
 
 
@@ -257,10 +250,7 @@ public class SysLoginController {
         ajax.put("user", user);
         ajax.put("roles", loginUser.getRolePermission());
         ajax.put("permissions", loginUser.getMenuPermission());
-        String key = GlobalConstants.SOCIAL_AUTH_CODE_KEY + loginUser.getTenantId();
-        ajax.put("isThirdPlatformLogin", ObjectUtil.isNotNull(RedisUtils.getCacheObject(key)) ? "true" : "false");
-        //删除三方平台登录标识
-        RedisUtils.deleteObject(key);
+        ajax.put("isThirdPlatformLogin", LoginHelper.getLoginUser().getIsThirdPlatformLogin());
         return R.ok(ajax);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/LoginUser.java

@@ -113,6 +113,11 @@ public class LoginUser implements Serializable {
      */
     private Long roleId;
 
+    /**
+     * 是否三方登录
+     */
+    private Boolean isThirdPlatformLogin;
+
     /**
      * 获取登录id
      */

dsk-system/src/main/java/com/dsk/system/service/SysLoginService.java

@@ -217,6 +217,7 @@ public class SysLoginService {
             LoginUser loginUser = buildLoginUser(user);
             // 生成token
             loginUser.setIpaddr(ipAddr);
+            loginUser.setIsThirdPlatformLogin(true);
             LoginHelper.loginByDevice(loginUser, DeviceType.PC);
 
             recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));