Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
a3bc670b
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a3bc670b
编写于
8月 18, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修改sso名称
上级
60ed8a05
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
15 addition
and
15 deletion
+15
-15
backend/src/main/java/io/metersphere/commons/constants/SsoMode.java
...c/main/java/io/metersphere/commons/constants/SsoMode.java
+1
-1
backend/src/main/java/io/metersphere/config/ShiroConfig.java
backend/src/main/java/io/metersphere/config/ShiroConfig.java
+1
-1
backend/src/main/java/io/metersphere/controller/IndexController.java
.../main/java/io/metersphere/controller/IndexController.java
+2
-2
backend/src/main/java/io/metersphere/controller/LoginController.java
.../main/java/io/metersphere/controller/LoginController.java
+7
-7
frontend/src/business/components/common/head/HeaderUser.vue
frontend/src/business/components/common/head/HeaderUser.vue
+2
-2
frontend/src/login/Login.vue
frontend/src/login/Login.vue
+2
-2
未找到文件。
backend/src/main/java/io/metersphere/commons/constants/
Oss
Mode.java
→
backend/src/main/java/io/metersphere/commons/constants/
Sso
Mode.java
浏览文件 @
a3bc670b
package
io.metersphere.commons.constants
;
public
enum
Oss
Mode
{
public
enum
Sso
Mode
{
CAS
,
LOCAL
}
backend/src/main/java/io/metersphere/config/ShiroConfig.java
浏览文件 @
a3bc670b
...
...
@@ -29,7 +29,7 @@ import java.util.Map;
import
java.util.Objects
;
@Configuration
@ConditionalOnProperty
(
prefix
=
"
oss
"
,
name
=
"mode"
,
havingValue
=
"local"
,
matchIfMissing
=
true
)
@ConditionalOnProperty
(
prefix
=
"
sso
"
,
name
=
"mode"
,
havingValue
=
"local"
,
matchIfMissing
=
true
)
public
class
ShiroConfig
implements
EnvironmentAware
{
private
Environment
env
;
...
...
backend/src/main/java/io/metersphere/controller/IndexController.java
浏览文件 @
a3bc670b
...
...
@@ -24,12 +24,12 @@ public class IndexController {
}
}
@GetMapping
(
value
=
"/
oss
/login"
)
@GetMapping
(
value
=
"/
sso
/login"
)
public
String
ossLogin
()
{
return
"redirect:/"
;
}
@GetMapping
(
value
=
"/
oss
/logout"
)
@GetMapping
(
value
=
"/
sso
/logout"
)
public
void
ossLogout
()
{
SecurityUtils
.
getSubject
().
logout
();
}
...
...
backend/src/main/java/io/metersphere/controller/LoginController.java
浏览文件 @
a3bc670b
package
io.metersphere.controller
;
import
io.metersphere.commons.constants.
Oss
Mode
;
import
io.metersphere.commons.constants.
Sso
Mode
;
import
io.metersphere.commons.constants.UserSource
;
import
io.metersphere.commons.user.SessionUser
;
import
io.metersphere.commons.utils.SessionUtils
;
...
...
@@ -32,9 +32,9 @@ public class LoginController {
}
return
ResultHolder
.
success
(
user
);
}
String
ossMode
=
env
.
getProperty
(
"oss
.mode"
);
if
(
ossMode
!=
null
&&
StringUtils
.
equalsIgnoreCase
(
OssMode
.
CAS
.
name
(),
oss
Mode
))
{
return
ResultHolder
.
error
(
"
oss
"
);
String
ssoMode
=
env
.
getProperty
(
"sso
.mode"
);
if
(
ssoMode
!=
null
&&
StringUtils
.
equalsIgnoreCase
(
SsoMode
.
CAS
.
name
(),
sso
Mode
))
{
return
ResultHolder
.
error
(
"
sso
"
);
}
return
ResultHolder
.
error
(
""
);
}
...
...
@@ -52,9 +52,9 @@ public class LoginController {
@GetMapping
(
value
=
"/signout"
)
public
ResultHolder
logout
()
{
String
ossMode
=
env
.
getProperty
(
"oss
.mode"
);
if
(
ossMode
!=
null
&&
StringUtils
.
equalsIgnoreCase
(
OssMode
.
CAS
.
name
(),
oss
Mode
))
{
return
ResultHolder
.
error
(
"
oss
"
);
String
ssoMode
=
env
.
getProperty
(
"sso
.mode"
);
if
(
ssoMode
!=
null
&&
StringUtils
.
equalsIgnoreCase
(
SsoMode
.
CAS
.
name
(),
sso
Mode
))
{
return
ResultHolder
.
error
(
"
sso
"
);
}
else
{
SecurityUtils
.
getSubject
().
logout
();
}
...
...
frontend/src/business/components/common/head/HeaderUser.vue
浏览文件 @
a3bc670b
...
...
@@ -41,9 +41,9 @@
localStorage
.
clear
();
window
.
location
.
href
=
"
/login
"
;
}
else
{
if
(
response
.
data
.
message
===
'
oss
'
)
{
if
(
response
.
data
.
message
===
'
sso
'
)
{
localStorage
.
clear
();
window
.
location
.
href
=
"
/
oss
/logout
"
window
.
location
.
href
=
"
/
sso
/logout
"
}
}
}).
catch
(
error
=>
{
...
...
frontend/src/login/Login.vue
浏览文件 @
a3bc670b
...
...
@@ -88,8 +88,8 @@
beforeCreate
()
{
this
.
$get
(
"
/isLogin
"
).
then
(
response
=>
{
if
(
!
response
.
data
.
success
)
{
if
(
response
.
data
.
message
===
'
oss
'
)
{
window
.
location
.
href
=
"
/
oss
/login
"
if
(
response
.
data
.
message
===
'
sso
'
)
{
window
.
location
.
href
=
"
/
sso
/login
"
}
else
{
this
.
ready
=
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录