Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
555da109
提交
555da109
编写于
3年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibiz-rt,ibizlab-runtime]
上级
5564c821
变更
7
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
27 行增加
和
26 行删除
+27
-26
main-form-base.vue
...eb/src/widgets/sys-user-auth/main-form/main-form-base.vue
+7
-14
MybatisConfiguration.java
...ava/cn/ibizlab/core/util/config/MybatisConfiguration.java
+2
-1
ibzrt.json
ibzrt-core/src/main/resources/sysmodel/ibzrt.json
+1
-1
AuthenticationUser.java
...ain/java/cn/ibizlab/util/security/AuthenticationUser.java
+8
-0
AuthorizationTokenFilter.java
...va/cn/ibizlab/util/security/AuthorizationTokenFilter.java
+2
-2
AuthenticationUserService.java
...va/cn/ibizlab/util/service/AuthenticationUserService.java
+7
-2
IBZUAAUserService.java
.../main/java/cn/ibizlab/util/service/IBZUAAUserService.java
+0
-6
未找到文件。
app_Web/src/widgets/sys-user-auth/main-form/main-form-base.vue
浏览文件 @
555da109
...
...
@@ -35,21 +35,14 @@
</i-col>
<i-col
v-show=
"detailsModel.identity_type.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'identity_type'
:itemRules=
"this.rules().identity_type"
class=
''
:caption=
"$t('entities.sysuserauth.main_form.details.identity_type')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.identity_type.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<dropdown-list
<input-box
v-model=
"data.identity_type"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:formState=
"formState"
:localContext =
'
{ }'
:localParam ='{ }'
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.identity_type.disabled"
valueType="string"
tag='UaaOpenAccessType'
codelistType='STATIC'
placeholder='请选择...' style="">
</dropdown-list>
type=
'text'
style=
""
>
</input-box>
</app-form-item>
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/util/config/MybatisConfiguration.java
浏览文件 @
555da109
...
...
@@ -11,6 +11,7 @@ import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.mybatis.spring.annotation.MapperScan
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
java.util.Properties
;
/**
...
...
@@ -19,7 +20,6 @@ import java.util.Properties;
@Configuration
@MapperScan
(
value
=
"cn.ibizlab.core.*.mapper"
,
nameGenerator
=
UniqueNameGenerator
.
class
)
public
class
MybatisConfiguration
{
/**
* mybatis适配多数据库
* @return
...
...
@@ -54,4 +54,5 @@ public class MybatisConfiguration {
return
paginationInterceptor
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/resources/sysmodel/ibzrt.json
浏览文件 @
555da109
...
...
@@ -5598,7 +5598,7 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
200
,
"key_field"
:
0
,
"show_order"
:
1000
,
"show_order"
:
6
,
"major_field"
:
1
}
],
...
...
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java
浏览文件 @
555da109
...
...
@@ -49,6 +49,14 @@ public class AuthenticationUser implements UserDetails
*/
private
String
domain
;
/**
* 租户
*/
private
String
srfdcid
;
/**
* 动态实例标识
*/
private
String
srfdynainstid
;
/**
* 部门标识
*/
private
String
mdeptid
;
...
...
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java
浏览文件 @
555da109
...
...
@@ -3,6 +3,7 @@ package cn.ibizlab.util.security;
import
io.jsonwebtoken.ExpiredJwtException
;
import
lombok.extern.slf4j.Slf4j
;
import
cn.ibizlab.util.service.AuthenticationUserService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
import
org.springframework.security.core.context.SecurityContextHolder
;
...
...
@@ -26,7 +27,7 @@ import java.util.*;
@Component
public
class
AuthorizationTokenFilter
extends
OncePerRequestFilter
{
private
final
UserDetails
Service
userDetailsService
;
private
final
AuthenticationUser
Service
userDetailsService
;
private
final
AuthTokenUtil
authTokenUtil
;
private
final
String
tokenHeader
;
private
Set
<
String
>
excludesPattern
=
new
HashSet
<
String
>();
...
...
@@ -60,7 +61,6 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
if
(
username
!=
null
&&
SecurityContextHolder
.
getContext
().
getAuthentication
()
==
null
)
{
UserDetails
userDetails
=
this
.
userDetailsService
.
loadUserByUsername
(
username
);
if
(
authTokenUtil
.
validateToken
(
authToken
,
userDetails
))
{
UsernamePasswordAuthenticationToken
authentication
=
new
UsernamePasswordAuthenticationToken
(
userDetails
,
null
,
userDetails
.
getAuthorities
());
authentication
.
setDetails
(
new
WebAuthenticationDetailsSource
().
buildDetails
(
request
));
...
...
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/service/AuthenticationUserService.java
浏览文件 @
555da109
...
...
@@ -16,11 +16,16 @@ public interface AuthenticationUserService extends UserDetailsService {
@Override
@Cacheable
(
value
=
"ibzuaa_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByUsername
(
String
username
);
default
AuthenticationUser
loadUserByUsername
(
String
username
){
return
null
;
}
@Cacheable
(
value
=
"ibzuaa_users"
,
key
=
"'getByUsername:'+#p0"
)
AuthenticationUser
loadUserByLogin
(
String
username
,
String
password
);
@CacheEvict
(
value
=
"ibzuaa_users"
,
key
=
"'getByUsername:'+#p0"
)
void
resetByUsername
(
String
username
);
default
void
resetByUsername
(
String
username
){}
}
This diff is collapsed.
Click to expand it.
ibzrt-util/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java
浏览文件 @
555da109
...
...
@@ -54,10 +54,4 @@ public class IBZUAAUserService implements AuthenticationUserService{
return
user
;
}
@Override
public
void
resetByUsername
(
String
username
)
{
}
}
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录