Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
d28b5441
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d28b5441
编写于
11月 18, 2021
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/sso' into 'wrdp'
修复ssoencrypt See merge request o2oa/o2oa!6091
上级
92ba2429
8e61400c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
7 addition
and
5 deletion
+7
-5
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java
.../authentication/jaxrs/authentication/ActionOauthBind.java
+3
-0
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java
...n/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java
+3
-4
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java
.../assemble/authentication/jaxrs/sso/ActionPostEncrypt.java
+1
-1
未找到文件。
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ActionOauthBind.java
浏览文件 @
d28b5441
...
...
@@ -32,9 +32,12 @@ class ActionOauthBind extends BaseAction {
// 获取oauthClient对象
OauthClient
oauthClient
=
oauthClient
(
name
);
Map
<
String
,
Object
>
param
=
oauthCreateParam
(
oauthClient
,
code
,
redirectUri
);
logger
.
debug
(
"oauth create param:{}"
,
param
);
oauthToken
(
oauthClient
,
param
);
logger
.
debug
(
"oauth token param:{}"
,
param
);
oauthCheckAccessToken
(
param
);
oauthInfo
(
oauthClient
,
param
);
logger
.
debug
(
"oauth info param:{}"
,
param
);
String
credential
=
Objects
.
toString
(
param
.
get
(
oauthClient
.
getInfoCredentialField
()),
""
);
oauthCheckCredential
(
credential
);
logger
.
debug
(
"credential:{}"
,
credential
);
...
...
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionGetEncrypt.java
浏览文件 @
d28b5441
...
...
@@ -5,7 +5,6 @@ import java.util.Date;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.commons.codec.binary.Base64
;
import
org.apache.commons.lang3.StringUtils
;
import
com.x.base.core.project.annotation.FieldDescribe
;
...
...
@@ -17,7 +16,6 @@ import com.x.base.core.project.http.EffectivePerson;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.Crypto
;
import
com.x.base.core.project.tools.DefaultCharset
;
class
ActionGetEncrypt
extends
BaseAction
{
...
...
@@ -40,8 +38,9 @@ class ActionGetEncrypt extends BaseAction {
throw
new
ExceptionClientNotExist
(
client
);
}
String
str
=
credential
+
TOKEN_SPLIT
+
new
Date
().
getTime
();
byte
[]
bs
=
Crypto
.
encrypt
(
str
.
getBytes
(
DefaultCharset
.
charset
),
key
.
getBytes
());
String
token
=
new
String
(
Base64
.
encodeBase64
(
bs
),
DefaultCharset
.
charset
);
String
token
=
Crypto
.
encrypt
(
str
,
key
);
// byte[] bs = Crypto.encrypt(str.getBytes(DefaultCharset.charset), key.getBytes());
// String token = new String(Base64.encodeBase64(bs), DefaultCharset.charset);
Wo
wo
=
new
Wo
();
wo
.
setToken
(
token
);
result
.
setData
(
wo
);
...
...
o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/sso/ActionPostEncrypt.java
浏览文件 @
d28b5441
...
...
@@ -24,7 +24,7 @@ class ActionPostEncrypt extends BaseAction {
ActionResult
<
Wo
>
execute
(
HttpServletRequest
request
,
HttpServletResponse
response
,
EffectivePerson
effectivePerson
,
JsonElement
jsonElement
)
throws
Exception
{
logger
.
debug
(
effectivePerson
,
"receive:{}"
,
jsonElement
);
logger
.
debug
(
"receive:{}"
,
jsonElement:
:
toString
);
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
if
(
StringUtils
.
isEmpty
(
wi
.
getClient
()))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录