Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
c137346d
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
c137346d
编写于
6月 09, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
根据路径转发bug修复
上级
ae98bfdb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
7 deletion
+14
-7
o2web/source/o2_core/o2.js
o2web/source/o2_core/o2.js
+6
-1
o2web/source/x_desktop/oauth.html
o2web/source/x_desktop/oauth.html
+4
-4
o2web/source/x_desktop/smapsso.html
o2web/source/x_desktop/smapsso.html
+3
-1
o2web/source/x_desktop/sso.html
o2web/source/x_desktop/sso.html
+1
-1
未找到文件。
o2web/source/o2_core/o2.js
浏览文件 @
c137346d
...
...
@@ -273,6 +273,11 @@
}
}
if
(
!
window
.
layout
)
window
.
layout
=
{};
if
(
!
window
.
layout
.
config
)
o2
.
JSON
.
get
(
"
../x_desktop/res/config/config.json
"
,
function
(
config
){
window
.
layout
.
config
=
config
;
},
null
,
false
);
if
(
window
.
layout
&&
layout
.
config
&&
layout
.
config
.
urlMapping
){
for
(
var
k
in
layout
.
config
.
urlMapping
){
var
regex
=
new
RegExp
(
k
);
...
...
@@ -2253,4 +2258,4 @@ COMMON.DOM.addReady = o2.addReady;
MWF
=
o2
;
MWF
.
getJSON
=
o2
.
JSON
.
get
;
MWF
.
getJSONP
=
o2
.
JSON
.
getJsonp
;
MWF
.
defaultPath
=
o2
.
session
.
path
;
\ No newline at end of file
MWF
.
defaultPath
=
o2
.
session
.
path
;
o2web/source/x_desktop/oauth.html
浏览文件 @
c137346d
...
...
@@ -96,7 +96,7 @@
}
var
r
=
protocol
+
"
//
"
+
location
.
host
+
location
.
pathname
;
r
=
r
+
"
?oauth=
"
+
oauth
+
"
&qywx=true
"
;
url
+=
"
&redirect_uri=
"
+
encodeURIComponent
(
o2
.
filterUrl
(
r
)
);
url
+=
"
&redirect_uri=
"
+
encodeURIComponent
(
r
);
window
.
location
=
url
;
}.
bind
(
this
));
...
...
@@ -110,7 +110,7 @@
}
var
r
=
protocol
+
"
//
"
+
location
.
host
+
location
.
pathname
;
r
=
r
+
"
?oauth=
"
+
oauth
+
"
&dingding=true
"
;
url
+=
"
&redirect_uri=
"
+
encodeURIComponent
(
o2
.
filterUrl
(
r
)
);
url
+=
"
&redirect_uri=
"
+
encodeURIComponent
(
r
);
window
.
location
=
url
;
}.
bind
(
this
));
}
else
{
...
...
@@ -121,7 +121,7 @@
r
=
r
+
"
?oauth=
"
+
oauth
;
if
(
method
)
r
=
r
+
"
&method=
"
+
method
;
if
(
redirect
)
r
=
r
+
"
&redirect=
"
+
redirect
;
p
=
(
p
)
?
p
+
"
&redirect_uri=
"
+
encodeURIComponent
(
o2
.
filterUrl
(
r
))
:
"
&redirect_uri=
"
+
encodeURIComponent
(
o2
.
filterUrl
(
r
)
);
p
=
(
p
)
?
p
+
"
&redirect_uri=
"
+
encodeURIComponent
(
r
)
:
"
&redirect_uri=
"
+
encodeURIComponent
(
r
);
url
=
(
url
.
indexOf
(
"
?
"
===
-
1
))
?
url
+
"
?
"
+
p
:
url
+
"
&
"
+
p
;
window
.
location
=
url
;
}.
bind
(
this
));
...
...
@@ -304,4 +304,4 @@
<!--<div id="layout" style="overflow: auto; height:100%"></div>-->
</body>
</html>
</html>
\ No newline at end of file
o2web/source/x_desktop/smapsso.html
浏览文件 @
c137346d
...
...
@@ -68,9 +68,11 @@
if
(
callback
)
callback
(
address
);
}.
bind
(
this
));
}
o2
.
addReady
(
function
(){
o2
.
JSON
.
get
(
"
res/config/config.json
"
,
function
(
config
){
window
.
layout
=
{};
window
.
layout
.
config
=
config
;
getServiceAddress
(
config
,
function
(
address
){
var
uri
=
new
URI
(
window
.
location
.
toString
());
var
xtoken
=
uri
.
getData
(
"
SMAP_SESSION_DATA
"
);
...
...
o2web/source/x_desktop/sso.html
浏览文件 @
c137346d
...
...
@@ -79,7 +79,7 @@
if
(
xtoken
){
var
res
=
new
Request
.
JSON
({
//url: "http://hbxa01.bf.ctc.com:20080/x_organization_assemble_authentication/jaxrs/sso",
url
:
o2
.
filterUrl
(
address
+
"
/jaxrs/sso
"
)
,
url
:
address
+
"
/jaxrs/sso
"
,
secure
:
false
,
method
:
"
POST
"
,
noCache
:
true
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录