Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
c34ad9a0
提交
c34ad9a0
authored
3月 08, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: ESlint格式化前端代码
上级
0d3e1d09
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
67 行增加
和
47 行删除
+67
-47
F2CRealm.java
backend/src/main/java/io/dataease/auth/config/F2CRealm.java
+1
-1
JWTUtils.java
backend/src/main/java/io/dataease/auth/util/JWTUtils.java
+17
-5
panel.js
frontend/src/api/panel/panel.js
+1
-1
zh.js
frontend/src/lang/zh.js
+4
-4
request.js
frontend/src/utils/request.js
+8
-0
index.vue
frontend/src/views/panel/index.vue
+36
-36
PanelList.vue
frontend/src/views/panel/list/PanelList.vue
+0
-0
没有找到文件。
backend/src/main/java/io/dataease/auth/config/F2CRealm.java
浏览文件 @
c34ad9a0
...
...
@@ -46,6 +46,7 @@ public class F2CRealm extends AuthorizingRealm {
}
//验证登录权限
@Override
protected
AuthenticationInfo
doGetAuthenticationInfo
(
AuthenticationToken
auth
)
throws
AuthenticationException
{
String
token
=
(
String
)
auth
.
getCredentials
();
...
...
@@ -63,7 +64,6 @@ public class F2CRealm extends AuthorizingRealm {
}
String
pass
=
null
;
try
{
/*pass = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, userBean.getPassword());*/
pass
=
user
.
getPassword
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
...
...
backend/src/main/java/io/dataease/auth/util/JWTUtils.java
浏览文件 @
c34ad9a0
...
...
@@ -6,18 +6,20 @@ import com.auth0.jwt.algorithms.Algorithm;
import
com.auth0.jwt.exceptions.JWTDecodeException
;
import
com.auth0.jwt.interfaces.DecodedJWT
;
import
io.dataease.auth.entity.TokenInfo
;
import
io.dataease.commons.utils.ServletUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.Date
;
public
class
JWTUtils
{
// token过期时间5
分钟
(过期会自动刷新续命 目的是避免一直都是同一个token )
// token过期时间5
min
(过期会自动刷新续命 目的是避免一直都是同一个token )
private
static
final
long
EXPIRE_TIME
=
1
*
60
*
1000
;
// 登录间隔时间 超过这个时间强制重新登录
private
static
final
long
Login_Interval
=
2
*
60
*
1000
;
// 登录间隔时间
10min
超过这个时间强制重新登录
private
static
final
long
Login_Interval
=
10
*
60
*
1000
;
/**
...
...
@@ -33,7 +35,17 @@ public class JWTUtils {
.
withClaim
(
"username"
,
tokenInfo
.
getUsername
())
.
withClaim
(
"userId"
,
tokenInfo
.
getUserId
())
.
build
();
verifier
.
verify
(
token
);
DecodedJWT
jwt
=
verifier
.
verify
(
token
);
Long
lastLoginTime
=
jwt
.
getClaim
(
"lastLoginTime"
).
asLong
();
long
now
=
System
.
currentTimeMillis
();
if
(
now
-
lastLoginTime
>
Login_Interval
){
// 登录超时
HttpServletResponse
response
=
ServletUtils
.
response
();
response
.
addHeader
(
"Access-Control-Expose-Headers"
,
"authentication-status"
);
response
.
setHeader
(
"authentication-status"
,
"login_expire"
);
// 前端拦截 登录超时状态 直接logout
return
false
;
}
return
true
;
}
...
...
frontend/src/api/panel/panel.js
浏览文件 @
c34ad9a0
...
...
@@ -108,4 +108,4 @@ export function post(url, data) {
})
}
export
default
{
loadTable
,
getScene
,
addGroup
,
delGroup
,
addTable
,
delTable
,
groupTree
,
defaultTree
}
export
default
{
loadTable
,
getScene
,
addGroup
,
delGroup
,
addTable
,
delTable
,
groupTree
,
defaultTree
}
frontend/src/lang/zh.js
浏览文件 @
c34ad9a0
...
...
@@ -683,10 +683,10 @@ export default {
},
panel
:
{
datalist
:
'视图列表'
,
group
:
'目录'
,
panel
:
'仪表盘'
,
groupAdd
:
'新建目录'
,
panelAdd
:
'新建仪表盘'
,
group
:
'目录'
,
panel
:
'仪表盘'
,
groupAdd
:
'新建目录'
,
panelAdd
:
'新建仪表盘'
,
delete
:
'删除'
,
move_to
:
'移动到'
,
rename
:
'重命名'
,
...
...
frontend/src/utils/request.js
浏览文件 @
c34ad9a0
...
...
@@ -52,6 +52,14 @@ const checkAuth = response => {
})
})
}
if
(
response
.
headers
[
'authentication-status'
]
===
'login_expire'
)
{
const
message
=
this
.
$t
(
'login.expires'
)
$alert
(
message
,
()
=>
{
store
.
dispatch
(
'user/logout'
).
then
(()
=>
{
location
.
reload
()
})
})
}
// token到期后自动续命 刷新token
if
(
response
.
headers
[
RefreshTokenKey
])
{
const
refreshToken
=
response
.
headers
[
RefreshTokenKey
]
...
...
frontend/src/views/panel/index.vue
浏览文件 @
c34ad9a0
...
...
@@ -4,65 +4,65 @@
<ms-aside-container>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
name=
"PanelList"
>
<span
slot=
"label"
><i
class=
"el-icon-document"
></i
>
列表
</span>
<PanelList
@
switchComponent=
"switchComponent"
/>
<span
slot=
"label"
><i
class=
"el-icon-document"
/
>
列表
</span>
<PanelList
@
switchComponent=
"switchComponent"
/>
</el-tab-pane>
<el-tab-pane
name=
"panels_star"
>
<span
slot=
"label"
><i
class=
"el-icon-star-off"
></i
>
收藏
</span>
<span
slot=
"label"
><i
class=
"el-icon-star-off"
/
>
收藏
</span>
开发中...
</el-tab-pane>
<el-tab-pane
name=
"panels_share"
>
<span
slot=
"label"
><i
class=
"el-icon-share"
></i
>
分享
</span>
<span
slot=
"label"
><i
class=
"el-icon-share"
/
>
分享
</span>
开发中...
</el-tab-pane>
<!--
<el-tab-pane
name=
"example"
>
-->
<!--
<span
slot=
"label"
><i
class=
"el-icon-star-on"
></i>
示例
</span>
-->
<!--
<group
@
switchComponent=
"switchComponent"
/>
-->
<!--
</el-tab-pane>
-->
<!--
<el-tab-pane
name=
"example"
>
-->
<!--
<span
slot=
"label"
><i
class=
"el-icon-star-on"
></i>
示例
</span>
-->
<!--
<group
@
switchComponent=
"switchComponent"
/>
-->
<!--
</el-tab-pane>
-->
</el-tabs>
</ms-aside-container>
<ms-main-container>
<!--
<router-view/>
-->
<component
:is=
"component"
:param=
"param"
@
switchComponent=
"switchComponent"
/>
<component
:is=
"component"
:param=
"param"
@
switchComponent=
"switchComponent"
/>
</ms-main-container>
</ms-container>
</
template
>
<
script
>
import
MsMainContainer
from
'@/metersphere/common/components/MsMainContainer'
import
MsContainer
from
'@/metersphere/common/components/MsContainer'
import
MsAsideContainer
from
'@/metersphere/common/components/MsAsideContainer'
// import Group from './group/Group'
import
PanelList
from
'./list/PanelList'
import
PanelView
from
'./list/PanelView'
import
MsMainContainer
from
'@/metersphere/common/components/MsMainContainer'
import
MsContainer
from
'@/metersphere/common/components/MsContainer'
import
MsAsideContainer
from
'@/metersphere/common/components/MsAsideContainer'
// import Group from './group/Group'
import
PanelList
from
'./list/PanelList'
import
PanelView
from
'./list/PanelView'
export
default
{
name
:
'Panel'
,
components
:
{
MsMainContainer
,
MsContainer
,
MsAsideContainer
,
PanelList
,
PanelView
},
data
()
{
return
{
component
:
PanelView
,
param
:
{},
activeName
:
'PanelList'
}
export
default
{
name
:
'Panel'
,
components
:
{
MsMainContainer
,
MsContainer
,
MsAsideContainer
,
PanelList
,
PanelView
},
data
()
{
return
{
component
:
PanelView
,
param
:
{},
activeName
:
'PanelList'
}
},
methods
:
{
handleClick
(
tab
,
event
)
{
console
.
log
(
tab
,
event
)
},
methods
:
{
handleClick
(
tab
,
event
)
{
console
.
log
(
tab
,
event
)
},
switchComponent
(
c
)
{
console
.
log
(
c
)
this
.
param
=
c
.
param
switch
(
c
.
name
)
{
case
'PanelView'
:
this
.
component
=
PanelView
break
}
switchComponent
(
c
)
{
console
.
log
(
c
)
this
.
param
=
c
.
param
switch
(
c
.
name
)
{
case
'PanelView'
:
this
.
component
=
PanelView
break
}
}
}
}
</
script
>
<
style
scoped
>
...
...
frontend/src/views/panel/list/PanelList.vue
浏览文件 @
c34ad9a0
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论