Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yujianwangzivayy
MaxKey
提交
86aa0f9e
MaxKey
项目概览
yujianwangzivayy
/
MaxKey
与 Fork 源项目一致
Fork自
MaxKey单点登录官方(MaxKeyTop) / MaxKey
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
86aa0f9e
编写于
11月 06, 2021
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
account mgmt
上级
bdaf0ac7
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
73 addition
and
27 deletion
+73
-27
maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java
maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java
+11
-0
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
...es/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
+28
-21
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java
...rg/maxkey/web/apps/contorller/ApplicationsController.java
+9
-2
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties
...ey-web-mgt/src/main/resources/messages/message.properties
+1
-0
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties
...web-mgt/src/main/resources/messages/message_en.properties
+1
-0
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties
...-mgt/src/main/resources/messages/message_zh_CN.properties
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl
...c/main/resources/templates/views/accounts/accountsAdd.ftl
+1
-1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl
.../src/main/resources/templates/views/apps/appAddCommon.ftl
+10
-1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl
...c/main/resources/templates/views/apps/appUpdateCommon.ftl
+10
-1
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
...rc/main/resources/templates/views/apps/selectAppsList.ftl
+1
-0
未找到文件。
maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java
浏览文件 @
86aa0f9e
...
...
@@ -140,6 +140,9 @@ public class Apps extends JpaBaseEntity implements Serializable {
@Column
private
String
adapter
;
@Column
protected
int
accountMgmt
;
protected
Accounts
appUser
;
@Column
...
...
@@ -583,6 +586,14 @@ public class Apps extends JpaBaseEntity implements Serializable {
this
.
adapterName
=
adapterName
;
}
public
int
getAccountMgmt
()
{
return
accountMgmt
;
}
public
void
setAccountMgmt
(
int
accountMgmt
)
{
this
.
accountMgmt
=
accountMgmt
;
}
@Override
public
String
toString
()
{
StringBuilder
builder
=
new
StringBuilder
();
...
...
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml
浏览文件 @
86aa0f9e
...
...
@@ -4,23 +4,27 @@
<sql
id=
"where_statement"
>
<if
test=
"id != null and id != ''"
>
and id = #{id}
and id
= #{id}
</if>
<if
test=
"name != null and name != ''"
>
and name
like
'%${name}%'
and name
like
'%${name}%'
</if>
<if
test=
"protocol != null and protocol != ''"
>
and protocol = #{protocol}
and protocol
= #{protocol}
</if>
<if
test=
"credential != null and credential != ''"
>
and credential = #{credential}
and credential
= #{credential}
</if>
<if
test=
"category != null and category != ''"
>
and category = #{category}
and category
= #{category}
</if>
<if
test=
"vendor != null and vendor != ''"
>
and vendor = #{vendor}
and vendor
= #{vendor}
</if>
<if
test=
"accountMgmt == 1 or accountMgmt == 2"
>
and accountmgmt = #{accountMgmt}
</if>
</sql>
...
...
@@ -67,6 +71,7 @@
principal,
credentials,
accountmgmt,
visible,
...
...
@@ -108,6 +113,7 @@
#{principal},
#{credentials},
#{accountMgmt},
#{visible},
...
...
@@ -125,17 +131,17 @@
<update
id=
"updateApp"
parameterType=
"Apps"
>
update mxk_apps set
name = #{name},
name
= #{name},
<if
test=
"icon != null"
>
icon = #{icon},
icon
= #{icon},
</if>
loginurl = #{loginUrl},
protocol = #{protocol},
category = #{category},
secret = #{secret},
description = #{description},
vendor = #{vendor},
vendorurl = #{vendorUrl},
loginurl
= #{loginUrl},
protocol
= #{protocol},
category
= #{category},
secret
= #{secret},
description
= #{description},
vendor
= #{vendor},
vendorurl
= #{vendorUrl},
credential = #{credential},
sharedusername = #{sharedUsername},
...
...
@@ -154,20 +160,21 @@
adaptername = #{adapterName},
adapter = #{adapter},
</if>
principal = #{principal},
credentials = #{credentials},
principal = #{principal},
credentials = #{credentials},
accountmgmt = #{accountMgmt},
visible = #{visible},
sortindex = #{sortIndex},
modifiedby = #{modifiedBy},
modifieddate = #{modifiedDate},
modifiedby
= #{modifiedBy},
modifieddate
= #{modifiedDate},
status = #{status},
status
= #{status},
logouturl = #{logoutUrl},
logouttype = #{logoutType}
where
ID = #{id}
ID
= #{id}
</update>
<select
id=
"queryMyApps"
parameterType=
"UserApps"
resultType=
"UserApps"
>
...
...
maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/apps/contorller/ApplicationsController.java
浏览文件 @
86aa0f9e
...
...
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Controller;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.servlet.ModelAndView
;
...
...
@@ -48,8 +49,14 @@ public class ApplicationsController extends BaseAppContorller {
}
@RequestMapping
(
value
={
"/select"
})
public
ModelAndView
select
(){
return
new
ModelAndView
(
"apps/selectAppsList"
);
public
ModelAndView
select
(
@RequestParam
(
name
=
"accountMgmt"
,
required
=
false
)
String
accountMgmt
){
ModelAndView
modelAndView
=
new
ModelAndView
(
"apps/selectAppsList"
);
if
(
accountMgmt
!=
null
)
{
modelAndView
.
addObject
(
"accountMgmt"
,
accountMgmt
);
}
else
{
modelAndView
.
addObject
(
"accountMgmt"
,
3
);
}
return
modelAndView
;
}
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message.properties
浏览文件 @
86aa0f9e
...
...
@@ -313,6 +313,7 @@ apps.extendAttr.parameter.type=\u7c7b\u578b
apps.extendAttr.parameter.value
=
\u
503c
apps.principal
=
\u
51ed
\u
8bc1
apps.credentials
=
\u
79d8
\u
94a5
apps.accountMgmt
=
\u
8D26
\u
53F7
\u
7BA1
\u7406
#adapter
apps.adapter.name
=
\u
540D
\u
79F0
apps.adapter.adapter
=
\u9002\u
914D
\u5668
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_en.properties
浏览文件 @
86aa0f9e
...
...
@@ -316,6 +316,7 @@ apps.extendAttr.parameter.type=type
apps.extendAttr.parameter.value
=
value
apps.principal
=
principal
apps.credentials
=
credentials
apps.accountMgmt
=
AccountMgmt
#adapter
apps.adapter.name
=
name
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/messages/message_zh_CN.properties
浏览文件 @
86aa0f9e
...
...
@@ -315,7 +315,7 @@ apps.extendAttr.parameter.type=\u7c7b\u578b
apps.extendAttr.parameter.value
=
\u
503c
apps.principal
=
\u
51ed
\u
8bc1
apps.credentials
=
\u
79d8
\u
94a5
apps.accountMgmt
=
\u
8D26
\u
53F7
\u
7BA1
\u7406
apps.adapter.name
=
\u
540D
\u
79F0
apps.adapter.adapter
=
\u9002\u
914D
\u5668
apps.adapter.protocol
=
\u
534F
\u
8BAE
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl
浏览文件 @
86aa0f9e
...
...
@@ -73,7 +73,7 @@
</td>
<td>
<input
class=
"button btn btn-primary mr-3 window"
type=
"button"
id=
"selectAppsubmitBtn"
value=
"<@locale code="
button.text.select
"
/>
"
wurl="
<
@
base
/>
/apps/select"
wurl="
<
@
base
/>
/apps/select
?accountMgmt=1
"
wwidth="800"
wheight="620"
target="window"/>
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appAddCommon.ftl
浏览文件 @
86aa0f9e
...
...
@@ -31,8 +31,17 @@
</tr>
<tr>
<th><@locale code="apps.logoutUrl"/>:</th>
<td colspan="3">
<input type="text" class="form-control" id="logoutUrl" name="logoutUrl" size="100" title="" value="" required="" />
</td>
</tr>
<tr>
<th><@locale code="apps.accountMgmt"/>:</th>
<td>
<input type="text" id="logoutUrl" class="form-control" name="logoutUrl" title="" value=""/>
<select id="accountMgmt" name="accountMgmt" class="form-control form-select" >
<option value="1" ><@locale code="common.text.status.enabled"/></option>
<option value="2" selected ><@locale code="common.text.status.disabled"/></option>
</select>
</td>
<th><@locale code="apps.logoutType"/></th>
<td>
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/appUpdateCommon.ftl
浏览文件 @
86aa0f9e
...
...
@@ -31,8 +31,17 @@
</tr>
<tr>
<th><@locale code="apps.logoutUrl"/>:</th>
<td colspan="3">
<input type="text" class="form-control" id="logoutUrl" name="logoutUrl" title="" value="${model.logoutUrl!}" required="" />
</td>
</tr>
<tr>
<th><@locale code="apps.accountMgmt"/>:</th>
<td>
<input type="text" id="logoutUrl" class="form-control" name="logoutUrl" title="" value="${model.logoutUrl!}"/>
<select id="accountMgmt" name="accountMgmt" class="form-control form-select" >
<option value="1" <#if 1==model.accountMgmt!>selected</#if> ><@locale code="common.text.status.enabled"/></option>
<option value="2" <#if 2==model.accountMgmt!>selected</#if> ><@locale code="common.text.status.disabled"/></option>
</select>
</td>
<th><@locale code="apps.logoutType"/></th>
<td>
...
...
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
浏览文件 @
86aa0f9e
...
...
@@ -31,6 +31,7 @@
<td
width=
"300px"
nowrap
>
<form
id=
"basic_search_form"
>
<input
type=
"text"
class=
"form-control"
name=
"name"
>
<input
type=
"hidden"
class=
"form-control"
name=
"accountMgmt"
value=
"${accountMgmt}"
>
</form>
</td>
<td
colspan=
"2"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录