LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0GA

Browse Source 
v2.0.0GA
This commit is contained in:
shimingxy
2020-07-04 09:43:15 +08:00
parent 585397b926
commit ca3d6e036b
26 changed files with 730 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxkey-web-manage/src/main/resources/maxkey.properties
View File

@@ -12,7 +12,7 @@ config.maxkey.uri=${config.server.name}/maxkey
#InMemory 0 , jdbc 1, Redis 2
config.server.persistence=0
#identity
config.identity.kafkasupport=true
config.identity.kafkasupport=false
############################################################################
# Login configuration
#enable captcha
@@ -62,7 +62,7 @@ config.saml.v20.sp.keystore=classpath\:config/samlClientKeystore.jks
config.saml.v20.sp.issuing.entity.id=client.maxkey.org
############################################################################
config.oidc.metadata.issuer=${config.server.name}/maxkey
config.oidc.metadata.issuer=https://${config.server.domain.sub}/maxkey
config.oidc.metadata.authorizationEndpoint=${config.server.name}/maxkey/oauth/v20/authorize
config.oidc.metadata.tokenEndpoint=${config.server.name}/maxkey/oauth/v20/token
config.oidc.metadata.userinfoEndpoint=${config.server.name}/maxkey/api/connect/userinfo

4
maxkey-web-manage/src/main/resources/messages/message.properties
View File

@@ -298,8 +298,8 @@ apps.formbased.parameter=\u53C2\u6570
apps.formbased.parameter.value=\u53C2\u6570\u503C
#cas
apps.cas.info=CAS\u8BA4\u8BC1
apps.cas.service=\u670D\u52A1\u5730\u5740
apps.cas.validation=\u9A8C\u8BC1\u5730\u5740
apps.cas.service=\u670D\u52A1
apps.cas.callbackUrl=\u56DE\u8C03\u5730\u5740
#desktop
apps.desktop.info=\u684C\u9762\u8BA4\u8BC1
apps.desktop.programPath=\u5E94\u7528\u5B89\u88C5\u8DEF\u5F84

2
maxkey-web-manage/src/main/resources/messages/message_en.properties
View File

@@ -298,7 +298,7 @@ apps.formbased.authorizeView=authorizeView
#cas
apps.cas.info=CAS Info
apps.cas.service=service
apps.cas.validation=validation
apps.cas.callbackUrl=CallbackUrl
#desktop
apps.desktop.info=Desktop Info
apps.desktop.programPath=programPath

4
maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
View File

@@ -298,8 +298,8 @@ apps.formbased.parameter=\u53C2\u6570
apps.formbased.parameter.value=\u53C2\u6570\u503C
#cas
apps.cas.info=CAS\u8BA4\u8BC1
apps.cas.service=\u670D\u52A1\u5730\u5740
apps.cas.validation=\u9A8C\u8BC1\u5730\u5740
apps.cas.service=\u670D\u52A1
apps.cas.callbackUrl=\u56DE\u8C03\u5730\u5740
#desktop
apps.desktop.info=\u684C\u9762\u8BA4\u8BC1
apps.desktop.programPath=\u5E94\u7528\u5B89\u88C5\u8DEF\u5F84

4
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appAdd.ftl
View File

@@ -52,9 +52,9 @@ $(function(){
</td>
</tr>
<tr>
<th style="width:15%;"><@locale code="apps.cas.validation"/>：</th>
<th style="width:15%;"><@locale code="apps.cas.callbackUrl"/>：</th>
<td colspan=3>
<input type="text" class="form-control" id="validation" name="validation" title="" value="" required="" />
<input type="text" class="form-control" id="callbackUrl" name="callbackUrl" title="" value="" required="" />
</td>
</tr>
<tr>

4
maxkey-web-manage/src/main/resources/templates/views/apps/cas/appUpdate.ftl
View File

@@ -62,9 +62,9 @@ $(function(){
</td>
</tr>
<tr>
<th style="width:15%;"><@locale code="apps.cas.validation"/>：</th>
<th style="width:15%;"><@locale code="apps.cas.callbackUrl"/>：</th>
<td colspan=3>
<input type="text" class="form-control" id="redirectUri" name="validation" title="" value="${model.validation}" required="" />
<input type="text" class="form-control" id="callbackUrl" name="callbackUrl" title="" value="${model.callbackUrl}" required="" />
</td>
</tr>

10
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl
View File

@@ -39,11 +39,11 @@ $(function () {
</tr>
<tr >
<td > <@locale code="org.pid" />：</td>
<td><input type="text" id="pId" name="pId" class="form-control"/></td>
<td><input type="text" id="pId" name="parentId" class="form-control"/></td>
</tr>
<tr>
<th width="200px"> <@locale code="org.pname" />：</td>
<td><input type="text" id="pName" name="pName" class="form-control"/></td>
<td><input type="text" id="pName" name="parentName" class="form-control"/></td>
</tr>
<tr >
<td > <@locale code="org.id" />：</td>
@@ -60,13 +60,13 @@ $(function () {
<tr >
<td > <@locale code="org.xpath" /> ：
</th>
<td><input type="text" id="xPath" name="xPath" class="form-control"/></td>
<td><input type="text" id="xPath" name="codePath" class="form-control"/></td>
</tr>
<tr >
<td > <@locale code="org.xnamepath" /> ：
</th>
<td><input type="text" id="xNamePath" name="xNamePath" class="form-control"/></td>
<td><input type="text" id="xNamePath" name="namePath" class="form-control"/></td>
</tr>
<tr>
@@ -81,7 +81,7 @@ $(function () {
<th >
<@locale code="org.sortorder" /> ：
</th>
<td><input type="text" id="sortOrder" name="sortOrder" class="form-control" value='1'/></td>
<td><input type="text" id="sortIndex" name="sortIndex" class="form-control" value='1'/></td>
</tr>
<tr>

2
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
View File

@@ -177,7 +177,7 @@ $(function () {
<td width="375px">
<form id="basic_search_form">
<input class="form-control" name="name" type="text" style ="width:150px;float:left;">
<input id="pId" class="form-control" name="pId" type="hidden" style ="width:150px;float:left;">
<input id="pId" class="form-control" name="parentId" type="hidden" style ="width:150px;float:left;">
<input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
<input class="button btn btn-secondary" id="advancedSearchExpandBtn" type="button" size="50" value="<@locale code="button.text.expandsearch"/>" expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>">
</form>

10
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsUpdate.ftl
View File

@@ -38,11 +38,11 @@ $(function () {
</tr>
<tr >
<td > <@locale code="org.pid" />：</td>
<td><input type="text" readonly id="pId" name="pId" class="form-control" value="${model.pId!}"/></td>
<td><input type="text" readonly id="pId" name="parentId" class="form-control" value="${model.parentId!}"/></td>
</tr>
<tr>
<th width="200px"> <@locale code="org.pname" />：</td>
<td><input type="text" readonly id="pName" name="pName" class="form-control" value="${model.pName!}"/></td>
<td><input type="text" readonly id="pName" name="parentName" class="form-control" value="${model.parentName!}"/></td>
</tr>
<tr >
<td > <@locale code="org.id" />：</td>
@@ -59,13 +59,13 @@ $(function () {
<tr >
<td > <@locale code="org.xpath" /> ：
</th>
<td><input type="text" id="xPath" name="xPath" class="form-control" value="${model.xPath!}"/></td>
<td><input type="text" id="xPath" name="codePath" class="form-control" value="${model.codePath!}"/></td>
</tr>
<tr >
<td > <@locale code="org.xnamepath" /> ：
</th>
<td><input type="text" id="xNamePath" name="xNamePath" class="form-control" value="${model.xNamePath!}"/></td>
<td><input type="text" id="xNamePath" name="namePath" class="form-control" value="${model.namePath!}"/></td>
</tr>
<tr>
@@ -80,7 +80,7 @@ $(function () {
<th >
<@locale code="org.sortorder" /> ：
</th>
<td><input type="text" id="sortOrder" name="sortOrder" class="form-control" value="${model.sortOrder!}"/></td>
<td><input type="text" id="sortOrder" name="sortIndex" class="form-control" value="${model.sortIndex!}"/></td>
</tr>
<tr>