Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MaxKey单点登录官方(MaxKeyTop)
MaxKey
提交
2d36296d
MaxKey
项目概览
MaxKey单点登录官方(MaxKeyTop)
/
MaxKey
8 个月 前同步成功
通知
75
Star
3
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
2d36296d
编写于
9月 24, 2021
作者:
MaxKey单点登录官方
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
mybatis-jpa-extra2.5 &batch delete
mybatis-jpa-extra2.5 &batch delete
上级
2fdd0182
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
31 addition
and
57 deletion
+31
-57
ReleaseNotes.txt
ReleaseNotes.txt
+5
-2
maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java
.../identity/scim/controller/ScimOrganizationController.java
+1
-1
maxkey-lib/mybatis-jpa-extra-2.4.jar
maxkey-lib/mybatis-jpa-extra-2.4.jar
+0
-0
maxkey-lib/mybatis-jpa-extra-2.5.jar
maxkey-lib/mybatis-jpa-extra-2.5.jar
+0
-0
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.5.jar
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.5.jar
+0
-0
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java
...ava/org/maxkey/autoconfigure/Saml20AutoConfiguration.java
+2
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java
...va/org/maxkey/web/apps/contorller/AdaptersController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java
...rg/maxkey/web/apps/contorller/ApplicationsController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java
...in/java/org/maxkey/web/contorller/AccountsController.java
+1
-4
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java
...java/org/maxkey/web/contorller/GroupMemberController.java
+5
-12
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java
.../org/maxkey/web/contorller/GroupPrivilegesController.java
+5
-15
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java
...ain/java/org/maxkey/web/contorller/NoticesController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java
...va/org/maxkey/web/contorller/OrganizationsController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java
...n/java/org/maxkey/web/contorller/ResourcesController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java
.../java/org/maxkey/web/contorller/RoleMemberController.java
+4
-12
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java
...java/org/maxkey/web/contorller/UserAdjointController.java
+1
-2
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java
...in/java/org/maxkey/web/contorller/UserInfoController.java
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java
...axkey/web/historys/contorller/LoginSessionController.java
+1
-2
未找到文件。
ReleaseNotes.txt
浏览文件 @
2d36296d
...
...
@@ -21,13 +21,16 @@
*(MAXKEY-210720) Jira SAML集成指南
*(MAXKEY-210721) 官方网站内容的优化,增加同类产品的比较,用户构建指南,完善集成应用列表
*(MAXKEY-210722) 日志信息的完善,包括登录过程日志,初始化日志,单点登录日志等
*(MAXKEY-210723) mgt登录错误提示信息
*(MAXKEY-210724) 依赖jar引用、更新和升级
*(MAXKEY-210723) mgt登录错误提示信息
*(MAXKEY-210724) 警告提示信息修复
*(MAXKEY-210725) 工具类增强和优化
*(MAXKEY-210726) 依赖jar引用、更新和升级
spring 5.3.10
springBoot 2.5.5
springkafka 2.7.7
spring-cloud 3.0.4
springcloudalibabacspl 1.8.2
mybatis-jpa-extra 2.5
tomcat 9.0.53
kafkaclients 2.8.1
jibGradlePlugin 3.1.4
...
...
maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java
浏览文件 @
2d36296d
...
...
@@ -51,7 +51,7 @@ public class ScimOrganizationController {
@RequestMapping
(
value
=
"/{id}"
,
method
=
RequestMethod
.
GET
)
public
MappingJacksonValue
getOrganization
(
@PathVariable
String
id
,
@RequestParam
(
required
=
false
)
String
attributes
)
{
Organization
user
=
null
;
//
Organization user = null;
return
null
;
}
...
...
maxkey-lib/mybatis-jpa-extra-2.4.jar
已删除
100644 → 0
浏览文件 @
2fdd0182
文件已删除
maxkey-lib/mybatis-jpa-extra-2.5.jar
0 → 100644
浏览文件 @
2d36296d
文件已添加
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.
4
.jar
→
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.
5
.jar
浏览文件 @
2d36296d
无法预览此类型文件
maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java
浏览文件 @
2d36296d
...
...
@@ -40,6 +40,7 @@ import org.opensaml.common.binding.security.IssueInstantRule;
import
org.opensaml.common.binding.security.MessageReplayRule
;
import
org.opensaml.util.storage.MapBasedStorageService
;
import
org.opensaml.util.storage.ReplayCache
;
import
org.opensaml.util.storage.ReplayCacheEntry
;
import
org.opensaml.xml.ConfigurationException
;
import
org.opensaml.xml.parse.BasicParserPool
;
import
org.slf4j.Logger
;
...
...
@@ -195,7 +196,7 @@ public class Saml20AutoConfiguration implements InitializingBean {
* @return replayCache
*/
@Bean
(
name
=
"replayCache"
)
public
ReplayCache
replayCache
(
MapBasedStorageService
mapBasedStorageService
,
public
ReplayCache
replayCache
(
MapBasedStorageService
<
String
,
ReplayCacheEntry
>
mapBasedStorageService
,
@Value
(
"${maxkey.saml.v20.replay.cache.life.in.millis}"
)
long
duration
)
{
ReplayCache
replayCache
=
new
ReplayCache
(
mapBasedStorageService
,
duration
);
return
replayCache
;
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/AdaptersController.java
浏览文件 @
2d36296d
...
...
@@ -139,7 +139,7 @@ public class AdaptersController {
public
Message
delete
(
@ModelAttribute
(
"appsAdapter"
)
AppsAdapters
appsAdapter
)
{
_logger
.
debug
(
"-delete appsAdapter :"
+
appsAdapter
);
if
(
appsAdaptersService
.
remov
e
(
appsAdapter
.
getId
()))
{
if
(
appsAdaptersService
.
batchDelet
e
(
appsAdapter
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java
浏览文件 @
2d36296d
...
...
@@ -157,7 +157,7 @@ public class ApplicationsController extends BaseAppContorller {
@RequestMapping
(
value
={
"/delete"
})
public
Message
delete
(
@ModelAttribute
(
"application"
)
Apps
application
)
{
_logger
.
debug
(
"-delete application :"
+
application
);
if
(
appsService
.
delete
(
application
))
{
if
(
appsService
.
batchDelete
(
application
.
getId
()
))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/AccountsController.java
浏览文件 @
2d36296d
...
...
@@ -135,10 +135,7 @@ public class AccountsController {
_logger
.
debug
(
"-delete AppAccounts :"
+
appAccounts
);
String
[]
appAccountsds
=
appAccounts
.
getId
().
split
(
","
);
for
(
int
i
=
0
;
i
<
appAccountsds
.
length
;
i
++){
accountsService
.
remove
(
appAccountsds
[
i
]);
}
accountsService
.
batchDelete
(
appAccounts
.
getId
());
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupMemberController.java
浏览文件 @
2d36296d
...
...
@@ -146,18 +146,11 @@ public class GroupMemberController {
if
(
groupMember
==
null
||
groupMember
.
getId
()
==
null
)
{
return
new
Message
(
"传入参数为空"
,
MessageType
.
error
);
}
boolean
result
=
true
;
String
groupMemberIds
=
groupMember
.
getId
();
if
(
groupMemberIds
!=
null
)
{
String
[]
arrMemberIds
=
groupMemberIds
.
split
(
","
);
for
(
int
i
=
0
;
i
<
arrMemberIds
.
length
;
i
++)
{
groupMemberService
.
remove
(
arrMemberIds
[
i
]);
}
if
(!
result
)
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_ERROR
),
MessageType
.
error
);
}
if
(
groupMemberService
.
batchDelete
(
groupMember
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_SUCCESS
),
MessageType
.
info
);
}
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_SUCCESS
),
MessageType
.
info
);
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_ERROR
),
MessageType
.
error
);
}
}
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/GroupPrivilegesController.java
浏览文件 @
2d36296d
...
...
@@ -127,22 +127,12 @@ public class GroupPrivilegesController {
if
(
groupApp
==
null
||
groupApp
.
getId
()
==
null
)
{
return
new
Message
(
"传入参数为空"
,
MessageType
.
error
);
}
String
privilegesIds
=
groupApp
.
getId
();
boolean
result
=
true
;
if
(
privilegesIds
!=
null
)
{
String
[]
arrPrivilegesIds
=
privilegesIds
.
split
(
","
);
for
(
int
i
=
0
;
i
<
arrPrivilegesIds
.
length
;
i
++)
{
result
=
groupPrivilegesService
.
remove
(
arrPrivilegesIds
[
i
]);
}
if
(!
result
)
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_ERROR
),
MessageType
.
error
);
}
if
(
groupPrivilegesService
.
batchDelete
(
groupApp
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_SUCCESS
),
MessageType
.
info
);
}
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_SUCCESS
),
MessageType
.
info
);
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_ERROR
),
MessageType
.
error
);
}
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/NoticesController.java
浏览文件 @
2d36296d
...
...
@@ -129,7 +129,7 @@ public class NoticesController {
public
Message
delete
(
@ModelAttribute
(
"notice"
)
Notices
notice
)
{
_logger
.
debug
(
"-delete notice :"
+
notice
);
if
(
noticesService
.
remov
e
(
notice
.
getId
()))
{
if
(
noticesService
.
batchDelet
e
(
notice
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/OrganizationsController.java
浏览文件 @
2d36296d
...
...
@@ -185,7 +185,7 @@ public class OrganizationsController {
@RequestMapping
({
"/delete"
})
public
Message
delete
(
@ModelAttribute
(
"org"
)
Organizations
org
)
{
_logger
.
debug
(
"-delete organization :"
+
org
);
if
(
this
.
organizationsService
.
remov
e
(
org
.
getId
()))
{
if
(
this
.
organizationsService
.
batchDelet
e
(
org
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
"message.action.delete.success"
),
MessageType
.
success
);
}
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/ResourcesController.java
浏览文件 @
2d36296d
...
...
@@ -142,7 +142,7 @@ public class ResourcesController {
public
Message
delete
(
@ModelAttribute
(
"resource"
)
Resources
resource
)
{
_logger
.
debug
(
"-delete resource :"
+
resource
);
if
(
resourcesService
.
remov
e
(
resource
.
getId
()))
{
if
(
resourcesService
.
batchDelet
e
(
resource
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/RoleMemberController.java
浏览文件 @
2d36296d
...
...
@@ -133,18 +133,10 @@ public class RoleMemberController {
if
(
roleMember
==
null
||
roleMember
.
getId
()
==
null
)
{
return
new
Message
(
"传入参数为空"
,
MessageType
.
error
);
}
boolean
result
=
true
;
String
roleMemberIds
=
roleMember
.
getId
();
if
(
roleMemberIds
!=
null
)
{
String
[]
arrMemberIds
=
roleMemberIds
.
split
(
","
);
for
(
int
i
=
0
;
i
<
arrMemberIds
.
length
;
i
++)
{
roleMemberService
.
remove
(
arrMemberIds
[
i
]);
}
if
(!
result
)
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_ERROR
),
MessageType
.
error
);
}
if
(
roleMemberService
.
batchDelete
(
roleMember
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_SUCCESS
),
MessageType
.
info
);
}
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_
SUCCESS
),
MessageType
.
info
);
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
INSERT_
ERROR
),
MessageType
.
error
);
}
}
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserAdjointController.java
浏览文件 @
2d36296d
...
...
@@ -134,9 +134,8 @@ public class UserAdjointController {
public
Message
delete
(
@ModelAttribute
(
"userInfoAdjoint"
)
UserInfoAdjoint
userInfoAdjoint
)
{
_logger
.
debug
(
"-delete group :"
+
userInfoAdjoint
);
if
(
userInfoAdjointService
.
remov
e
(
userInfoAdjoint
.
getId
()))
{
if
(
userInfoAdjointService
.
batchDelet
e
(
userInfoAdjoint
.
getId
()))
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
error
);
}
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/UserInfoController.java
浏览文件 @
2d36296d
...
...
@@ -222,7 +222,7 @@ public class UserInfoController {
@RequestMapping
(
value
=
"/delete"
)
public
Message
deleteUsersById
(
@RequestParam
(
"id"
)
String
id
)
{
_logger
.
debug
(
id
);
if
(
userInfoService
.
batchDelete
(
StringUtils
.
string2List
(
id
,
","
)
))
{
if
(
userInfoService
.
batchDelete
(
id
))
{
//provisioningPrepare.prepare(userInfo, OPERATEACTION.DELETE_ACTION);
return
new
Message
(
WebContext
.
getI18nValue
(
ConstantsOperateMessage
.
DELETE_SUCCESS
),
MessageType
.
success
);
}
else
{
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java
浏览文件 @
2d36296d
...
...
@@ -102,8 +102,7 @@ public class LoginSessionController {
for
(
String
sessionId
:
StringUtils
.
string2List
(
ids
,
","
))
{
_logger
.
trace
(
"terminate session Id {} "
,
sessionId
);
if
(
currentUserSessionId
.
contains
(
sessionId
))
{
//skip current session
continue
;
continue
;
//skip current session
}
UserInfo
userInfo
=
WebContext
.
getUserInfo
();
String
lastLogoffTime
=
DateUtils
.
formatDateTime
(
new
Date
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录