Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-11 74a02276be3564efac5f49d9fa93c08cd705e16a

 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/service/impl/LoginServiceImpl.java

@@ -29,6 +29,7 @@
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.bind.annotation.RequestParam;

import static java.util.Objects.nonNull;

@@ -143,6 +144,7 @@
        operlog.setRequestMethod(request.getMethod());
        operlog.setOperLocation(IPUtil.getIpBelongAddress(request));
        operlog.setOperTime(new Date()); // 创建时间
        operlog.setCommunityId(loginUser.getCommunityId());
        userService.addOperLog(operlog);
        return loginReturnVO;
    }
@@ -336,4 +338,25 @@
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }

    /**
     * 电动车商城后台用户登录
     *
     * @param account
     *            账户
     * @param password
     *            密码
     * @return 登录结果
     */
    @Override
    public LoginReturnVO loginBatteryUser(String account, String password,String appid) {
        Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account + "_20"+"_"+appid, password));
        LoginUserInfoVO loginUser = (LoginUserInfoVO)authentication.getPrincipal();
        String token = JWTTokenUtil.generateToken(loginUser);
        String refeshToken = JWTTokenUtil.generateRefeshToken(loginUser);
        LoginReturnVO loginReturnVO = new LoginReturnVO();
        loginReturnVO.setToken(token);
        loginReturnVO.setRefreshToken(refeshToken);
        return loginReturnVO;
    }
}