代码提交

 Source/UBCS/ubcs-auth/pom.xml

@@ -132,6 +132,11 @@
            <artifactId>activation</artifactId>
            <version>1.1.1</version>
        </dependency>-->
        <dependency>
            <groupId>com.vci.ubcs</groupId>
            <artifactId>ubcs-util-api</artifactId>
            <version>3.0.1.RELEASE</version>
        </dependency>
    </dependencies>

    <build>

 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java

@@ -16,6 +16,7 @@
 */
package com.vci.ubcs.auth.endpoint;

import com.vci.ubcs.starter.util.HttpUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthCallback;
@@ -65,8 +66,11 @@
     */
    @GetMapping("/oauth/oasso")
    public ModelAndView require(HttpServletRequest request, ModelAndView model) {
        // æ‹¿åˆ°ç”¨æˆ·çš„鉴权信息
        // 1、拿到用户的鉴权信息
        String userName = request.getParameter("username");
        // 2、调用鉴权登录接口，这里采用授权码模式
        // 3、构建请求地址，
        //HttpUtils.post();

        model.setViewName("login");
        return model;

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/HttpUtils.java

ÎļþÃû´Ó Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/HttpUtils.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.vci.ubcs.code.util;
package com.vci.ubcs.starter.util;

import org.springframework.http.*;
import org.springframework.util.LinkedMultiValueMap;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java

@@ -25,7 +25,7 @@
import com.vci.ubcs.code.enumpack.*;
import com.vci.ubcs.code.mapper.*;
import com.vci.ubcs.code.service.*;
import com.vci.ubcs.code.util.HttpUtils;
import com.vci.ubcs.starter.util.HttpUtils;
import com.vci.ubcs.code.util.WsErpClientUtil;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.code.wrapper.DockingSysIntHeaderWrapper;

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/PasswordFreeLoginServiceImpl.java

@@ -3,15 +3,15 @@
import com.alibaba.fastjson.JSON;
import com.vci.ubcs.code.entity.TokenUserObject;
import com.vci.ubcs.code.service.IPasswordFreeLoginService;
import com.vci.ubcs.code.util.HttpUtils;
import com.vci.ubcs.starter.util.HttpUtils;
import io.jsonwebtoken.Claims;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.auth.AuthenticationException;
import org.springblade.core.jwt.JwtUtil;
import org.springblade.core.jwt.props.JwtProperties;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.ObjectUtil;
@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;

import static org.springblade.core.secure.utils.AuthUtil.parseJWT;

@@ -40,6 +41,7 @@
 * @date 2023/9/11 15:45
 */
@Service
@Slf4j
public class PasswordFreeLoginServiceImpl implements IPasswordFreeLoginService {

    // é€šè¿‡æœåŠ¡æ³¨å†Œä¸­å¿ƒèŽ·å–网关的端口号
@@ -47,10 +49,12 @@
    private DiscoveryClient discoveryClient;
    // é…ç½®çš„免密登录的账号所属的租户id
    @Value("${password-free.pwd-free-tenant-id}")
    // é…ç½®çš„token在redis中的生存时间
    private String pwdFreeTenantId;
    // é…ç½®çš„token在redis中的生存时间
    @Value("${password-free.token-redis-expire}")
    private Long tokenRedisExpire;
    @Value("${password-free.pwd-free-addr}")
    private String pwdFreeAddr;
    @Autowired
    private BladeRedis bladeRedis;

@@ -91,7 +95,8 @@
        //不存在就请求
        if(Func.isEmpty(authToken) || Func.isEmpty(user)){
            // å…å¯†ç™»å½•æŽ¥å£åœ°å€
            String loginUrl = "http://localhost:"+this.getGatewayPort("ubcs-gateway")+"/ubcs-auth/oauth/token";
            String loginUrl = "http://"+pwdFreeAddr+":"+this.getGatewayPort("ubcs-gateway")+"/ubcs-auth/oauth/token";
            log.debug("当前免密登录调用地址："+loginUrl);
            // è¯·æ±‚ubcs-auth服务获取token，先设置请求头
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -124,7 +129,6 @@
            token2 = JwtUtil.getToken(authToken);
            user = this.getUser(token2);
        }

        //request.setAttribute("Blade-Auth",token);
        request.setAttribute("_BLADE_USER_REQUEST_ATTR_",user);
        return true;