Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
This commit is contained in:
commit
e64b5952ca
|
@ -237,9 +237,9 @@ public class Oauth2Filter extends AuthenticatingFilter {
|
||||||
Result<Map> result = sysUserTokenService.createToken(sysUserEntity.getId());
|
Result<Map> result = sysUserTokenService.createToken(sysUserEntity.getId());
|
||||||
Object token = result.getData().get(Constant.TOKEN_HEADER);
|
Object token = result.getData().get(Constant.TOKEN_HEADER);
|
||||||
String currentToken = (String) token;
|
String currentToken = (String) token;
|
||||||
Cookie cookie = new Cookie(Constant.TOKEN_HEADER, currentToken);
|
// Cookie cookie = new Cookie(Constant.TOKEN_HEADER, currentToken);
|
||||||
cookie.setPath("/");
|
// cookie.setPath("/");
|
||||||
response.addCookie(cookie);
|
// response.addCookie(cookie);
|
||||||
response.addHeader(Constant.TOKEN_HEADER, currentToken);
|
response.addHeader(Constant.TOKEN_HEADER, currentToken);
|
||||||
//回调不涉及其他页面回调,先写死回调首页
|
//回调不涉及其他页面回调,先写死回调首页
|
||||||
String removeCreditParame = "http://" + urlBuilder.getHost() + ":" + urlBuilder.getPort() + "/#/home";
|
String removeCreditParame = "http://" + urlBuilder.getHost() + ":" + urlBuilder.getPort() + "/#/home";
|
||||||
|
@ -267,9 +267,9 @@ public class Oauth2Filter extends AuthenticatingFilter {
|
||||||
Result<Map> result = sysUserTokenService.createToken(sysUserEntity.getId());
|
Result<Map> result = sysUserTokenService.createToken(sysUserEntity.getId());
|
||||||
Object token = result.getData().get(Constant.TOKEN_HEADER);
|
Object token = result.getData().get(Constant.TOKEN_HEADER);
|
||||||
String currentToken = (String) token;
|
String currentToken = (String) token;
|
||||||
Cookie cookie = new Cookie(Constant.TOKEN_HEADER, currentToken);
|
// Cookie cookie = new Cookie(Constant.TOKEN_HEADER, currentToken);
|
||||||
cookie.setPath("/");
|
// cookie.setPath("/");
|
||||||
response.addCookie(cookie);
|
// response.addCookie(cookie);
|
||||||
response.addHeader(Constant.TOKEN_HEADER, currentToken);
|
response.addHeader(Constant.TOKEN_HEADER, currentToken);
|
||||||
//去掉凭证参数
|
//去掉凭证参数
|
||||||
String removeCreditParame = ssoValidator.removeCreditParame(requestUri);
|
String removeCreditParame = ssoValidator.removeCreditParame(requestUri);
|
||||||
|
|
Loading…
Reference in New Issue