|
|
@@ -57,28 +57,26 @@ public class Oauth2Controller {
|
|
|
public void setSaOAuth2Config(SaOAuth2Config cfg) {
|
|
|
// 配置：未登录时返回的View
|
|
|
cfg.setNotLoginView(() -> {
|
|
|
- HttpServletRequest req = SpringMVCUtil.getRequest();
|
|
|
- Map<String, String[]> paramMap = req.getParameterMap();
|
|
|
+ SaRequest req = SaHolder.getRequest();
|
|
|
+ Map<String, String> paramMap = req.getParamMap();
|
|
|
StringBuilder param = new StringBuilder();
|
|
|
paramMap.forEach((k, v) -> {
|
|
|
- param.append("&").append(k).append("=").append(v[0]);
|
|
|
+ param.append("&").append(k).append("=").append(v);
|
|
|
});
|
|
|
param.deleteCharAt(0);
|
|
|
- String callBackUrl = String.format("%s?%s", req.getRequestURL(), param);
|
|
|
+ String callBackUrl = String.format("%s?%s", commonPropertiesConfig.getDomainApi(), param);
|
|
|
|
|
|
String key = GlobalConstant.OAUTH2 + IdUtil.simpleUUID();
|
|
|
redisUtil.set(key, callBackUrl, 86400);
|
|
|
|
|
|
- HttpServletResponse res = SpringMVCUtil.getResponse();
|
|
|
- Cookie cookie = new Cookie("Oauth2Info",key);
|
|
|
+ SaResponse res = SaHolder.getResponse();
|
|
|
+ SaCookie cookie = new SaCookie()
|
|
|
+ .setName("Oauth2Info")
|
|
|
+ .setValue(key);
|
|
|
|
|
|
res.addCookie(cookie);
|
|
|
|
|
|
- try {
|
|
|
- res.sendRedirect(String.format("%s/#/login", commonPropertiesConfig.getDomainWeb()));
|
|
|
- } catch (IOException e) {
|
|
|
- throw new RuntimeException(e);
|
|
|
- }
|
|
|
+ res.redirect(String.format("%s/#/login", commonPropertiesConfig.getDomainWeb()));
|
|
|
return null;
|
|
|
}).
|
|
|
// 配置：登录处理函数
|
fanxp