Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
程序猿小郑
microservices-platform
提交
c88369dd
microservices-platform
项目概览
程序猿小郑
/
microservices-platform
与 Fork 源项目一致
Fork自
zlt2000 / microservices-platform
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
microservices-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c88369dd
编写于
8月 05, 2019
作者:
zlt2000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
优化token返回前端的json为标准格式
上级
261b74bd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
24 deletion
+35
-24
zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ResponseUtil.java
.../src/main/java/com/central/common/utils/ResponseUtil.java
+30
-7
zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java
...n/java/com/central/oauth/controller/OAuth2Controller.java
+3
-15
zlt-web/back-web/src/main/resources/static/login.html
zlt-web/back-web/src/main/resources/static/login.html
+2
-2
未找到文件。
zlt-commons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ResponseUtil.java
浏览文件 @
c88369dd
package
com.central.common.utils
;
import
com.central.common.model.Result
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.springframework.http.MediaType
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.Writer
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* @author zlt
...
...
@@ -27,15 +26,39 @@ public class ResponseUtil {
* @throws IOException
*/
public
static
void
responseWriter
(
ObjectMapper
objectMapper
,
HttpServletResponse
response
,
String
msg
,
int
httpStatus
)
throws
IOException
{
Map
<
String
,
String
>
rsp
=
new
HashMap
<>(
2
);
response
.
setStatus
(
httpStatus
);
rsp
.
put
(
"resp_code"
,
String
.
valueOf
(
httpStatus
));
rsp
.
put
(
"resp_msg"
,
msg
);
Result
result
=
Result
.
succeedWith
(
null
,
httpStatus
,
msg
);
responseWrite
(
objectMapper
,
response
,
result
);
}
/**
* 通过流写到前端
* @param objectMapper 对象序列化
* @param response
* @param obj
*/
public
static
void
responseSucceed
(
ObjectMapper
objectMapper
,
HttpServletResponse
response
,
Object
obj
)
throws
IOException
{
Result
result
=
Result
.
succeed
(
obj
);
responseWrite
(
objectMapper
,
response
,
result
);
}
/**
* 通过流写到前端
* @param objectMapper
* @param response
* @param msg
* @throws IOException
*/
public
static
void
responseFailed
(
ObjectMapper
objectMapper
,
HttpServletResponse
response
,
String
msg
)
throws
IOException
{
Result
result
=
Result
.
failed
(
msg
);
responseWrite
(
objectMapper
,
response
,
result
);
}
private
static
void
responseWrite
(
ObjectMapper
objectMapper
,
HttpServletResponse
response
,
Result
result
)
throws
IOException
{
response
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8_VALUE
);
try
(
Writer
writer
=
response
.
getWriter
()
)
{
writer
.
write
(
objectMapper
.
writeValueAsString
(
r
sp
));
writer
.
write
(
objectMapper
.
writeValueAsString
(
r
esult
));
writer
.
flush
();
}
}
...
...
zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java
浏览文件 @
c88369dd
package
com.central.oauth.controller
;
import
com.central.common.constant.SecurityConstants
;
import
com.central.common.
model.Result
;
import
com.central.common.
utils.ResponseUtil
;
import
com.central.oauth2.common.token.MobileAuthenticationToken
;
import
com.central.oauth2.common.token.OpenIdAuthenticationToken
;
import
com.central.oauth2.common.util.AuthUtils
;
...
...
@@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.commons.collections.MapUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.MediaType
;
import
org.springframework.security.authentication.*
;
import
org.springframework.security.core.Authentication
;
import
org.springframework.security.core.context.SecurityContextHolder
;
...
...
@@ -29,7 +28,6 @@ import javax.annotation.Resource;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.Writer
;
/**
* OAuth2相关操作
...
...
@@ -99,7 +97,7 @@ public class OAuth2Controller {
OAuth2Authentication
oAuth2Authentication
=
new
OAuth2Authentication
(
oAuth2Request
,
authentication
);
OAuth2AccessToken
oAuth2AccessToken
=
authorizationServerTokenServices
.
createAccessToken
(
oAuth2Authentication
);
oAuth2Authentication
.
setAuthenticated
(
true
);
writerObj
(
response
,
oAuth2AccessToken
);
ResponseUtil
.
responseSucceed
(
objectMapper
,
response
,
oAuth2AccessToken
);
}
catch
(
BadCredentialsException
|
InternalAuthenticationServiceException
e
)
{
exceptionHandler
(
response
,
badCredenbtialsMsg
);
}
catch
(
Exception
e
)
{
...
...
@@ -114,17 +112,7 @@ public class OAuth2Controller {
private
void
exceptionHandler
(
HttpServletResponse
response
,
String
msg
)
throws
IOException
{
response
.
setStatus
(
HttpStatus
.
UNAUTHORIZED
.
value
());
writerObj
(
response
,
Result
.
failed
(
msg
));
}
private
void
writerObj
(
HttpServletResponse
response
,
Object
obj
)
throws
IOException
{
response
.
setContentType
(
MediaType
.
APPLICATION_JSON_UTF8_VALUE
);
try
(
Writer
writer
=
response
.
getWriter
()
)
{
writer
.
write
(
objectMapper
.
writeValueAsString
(
obj
));
writer
.
flush
();
}
ResponseUtil
.
responseFailed
(
objectMapper
,
response
,
msg
);
}
private
ClientDetails
getClient
(
String
clientId
,
String
clientSecret
)
{
...
...
zlt-web/back-web/src/main/resources/static/login.html
浏览文件 @
c88369dd
...
...
@@ -91,8 +91,8 @@
},
success
:
function
(
data
)
{
//console.log(JSON.stringify(data));
if
(
data
.
access_token
)
{
config
.
putToken
(
data
);
if
(
data
.
resp_code
===
0
)
{
config
.
putToken
(
data
.
datas
);
layer
.
msg
(
'
登录成功
'
,
{
icon
:
1
,
time
:
500
},
function
()
{
location
.
replace
(
'
./
'
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录