public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 12:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.9.0GA & SQL data

Browse Source
This commit is contained in:
MaxKey
2021-08-20 09:11:13 +08:00
parent 5d6eabe7f1
commit 68dcbce728
44 changed files with 182 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java
View File

@@ -120,7 +120,7 @@ public class AppListController {
} else {
modelAndView.addObject("protectedappId", false);
}
modelAndView.addObject("uid", userInfo.getId());
modelAndView.addObject("userId", userInfo.getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("protocol", protocol);
modelAndView.addObject("credential", credential);
@@ -223,7 +223,7 @@ public class AppListController {
modelAndView.addObject("password", false);
}
modelAndView.addObject("uid", userInfo.getId());
modelAndView.addObject("userId", userInfo.getId());
modelAndView.addObject("appId", appId);
modelAndView.addObject("protocol", protocol);
modelAndView.addObject("credential", credential);
@@ -242,7 +242,7 @@ public class AppListController {
Accounts appUsers = new Accounts();
appUsers.setAppId(appId);
appUsers.setUid(userInfo.getId());
appUsers.setUserId(userInfo.getId());
if (identity_password != null && !identity_password.equals("") && credential == Apps.CREDENTIALS.USER_DEFINED) {
appUsers = appUsersService.load(new Accounts(userInfo.getId(), appId));
@@ -251,7 +251,7 @@ public class AppListController {
appUsers.setId(appUsers.generateId());
appUsers.setAppId(appId);
appUsers.setAppName(app.getName());
appUsers.setUid(userInfo.getId());
appUsers.setUserId(userInfo.getId());
appUsers.setUsername(userInfo.getUsername());
appUsers.setDisplayName(userInfo.getDisplayName());

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java
View File

@@ -58,7 +58,7 @@ public class SocialSignOnListController {
List<SocialSignOnProvider> listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders();
SocialsAssociate socialSignOnUser=new SocialsAssociate();
socialSignOnUser.setUid(WebContext.getUserInfo().getId());
socialSignOnUser.setUserId(WebContext.getUserInfo().getId());
List<SocialsAssociate> listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser);
List<SocialSignOnProvider> listBindSocialSignOnProvider=new ArrayList<SocialSignOnProvider>();
_logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider);

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/HistoryLoginController.java
View File

@@ -69,7 +69,7 @@ public class HistoryLoginController {
@ResponseBody
public JpaPageResults<HistoryLogin> logAuthsGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) {
_logger.debug("history/login/grid/ logsGrid() " + historyLogin);
historyLogin.setUid(WebContext.getUserInfo().getId());
historyLogin.setUserId(WebContext.getUserInfo().getId());
return historyLoginService.queryPageResults(historyLogin);
}

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/historys/contorller/LoginSessionController.java
View File

@@ -89,7 +89,7 @@ public class LoginSessionController {
@ResponseBody
public JpaPageResults<HistoryLogin> loginSessionListGrid(@ModelAttribute("historyLogin") HistoryLogin historyLogin) {
_logger.debug("history/loginsession/ loginSessionListGrid() " + historyLogin);
historyLogin.setUid(WebContext.getUserInfo().getId());
historyLogin.setUserId(WebContext.getUserInfo().getId());
return historyLoginService.queryOnlineSession(historyLogin);
}

2
maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/HistoryLoginAppAdapter.java
View File

@@ -91,7 +91,7 @@ public class HistoryLoginAppAdapter implements AsyncHandlerInterceptor {
historyLoginApps.setAppId(app.getId());
historyLoginApps.setSessionId(sessionId);
historyLoginApps.setAppName(app.getName());
historyLoginApps.setUid(userInfo.getId());
historyLoginApps.setUserId(userInfo.getId());
historyLoginApps.setUsername(userInfo.getUsername());
historyLoginApps.setDisplayName(userInfo.getDisplayName());
historyLoginAppsService.insert(historyLoginApps);

2
maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties
View File

@@ -22,5 +22,5 @@ application.formatted-version=v2.9.0 GA
############################################################################
#spring.profiles.active https/http; default https #
############################################################################
spring.profiles.active=http
spring.profiles.active=https

4
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/authorize/init_sso_credential.ftl
View File

@@ -22,8 +22,8 @@
<td><input required="" class="form-control" type="password" id="identity_password" name="identity_password" value="" /></td>
</tr>
<tr style="display:none">
<td>uid</td>
<td><input type="text" id="uid" name="uid" value="${uid}" /></td>
<td>userId</td>
<td><input type="text" id="userId" name="userId" value="${userId}" /></td>
</tr>
<tr style="display:none">
<td>appId</td>

6
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/historys/loginList.ftl
View File

@@ -77,9 +77,9 @@
<th data-field="logoutTime"><@locale code="log.loginhistory.logoutTime"/></th>
<th data-field="platform"><@locale code="log.loginhistory.platform"/></th>
<th data-field="application"><@locale code="log.loginhistory.application"/></th>
<th data-field="loginUrl"><@locale code="log.loginhistory.loginUrl"/></th>
<th data-field="code"><@locale code="log.loginhistory.code"/></th>
<th data-field="rpUserInfo"><@locale code="log.loginhistory.rpUserInfo"/></th>
<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
<th data-field="code" data-visible="false"><@locale code="log.loginhistory.code"/></th>
<th data-field="rpUserInfo" data-visible="false"><@locale code="log.loginhistory.rpUserInfo"/></th>
</tr>
</thead>

2
maxkey-webs/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl
View File

@@ -32,7 +32,7 @@
<tr style="display:none">
<td>uid</td>
<td><input class="form-control" type="text" id="uid" name="uid" value="${uid}" /></td>
<td><input class="form-control" type="text" id="userId" name="userId" value="${userId}" /></td>
</tr>
<tr style="display:none">
<td>appId</td>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
View File

@@ -71,7 +71,7 @@
<td colspan="2" class="center">
<input id="_method" type="hidden" name="_method" value="post"/>
<input id="status" type="hidden" name="status" value="1"/>
<input type="hidden" id="uid" name="uid" class="uid" title="" value="${model.uid!}"/>
<input type="hidden" id="userId" name="userId" class="userId" title="" value="${model.userId!}"/>
<input type="hidden" id="appId" name="appId" class="appId" title="" value="${model.appId!}"/>
<input class="button btn btn-primary mr-3" type="submit" id="submitBtn" value="<@locale code="button.text.save" />"/>
<input class="button btn btn-secondary mr-3" type="button" id="closeBtn" value="<@locale code="button.text.cancel" /> "/>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appAdd.ftl
View File

@@ -93,7 +93,7 @@ $(function(){
<th><@locale code="apps.systemUserAttr"/>：</th>
<td colspan="3">
<select id="systemUserAttr" name="systemUserAttr" class="form-control" >
<option value="uid">
<option value="userId">
<@locale code="userinfo.id"/></option>
<option value="employeeNumber">
<@locale code="userinfo.employeeNumber"/></option>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/formbased/appUpdate.ftl
View File

@@ -96,7 +96,7 @@ $(function(){
<th><@locale code="apps.systemUserAttr"/>：</th>
<td colspan="3">
<select id="systemUserAttr" name="systemUserAttr" class="form-control">
<option value="uid" <#if 'uid'==model.systemUserAttr>selected</#if> >
<option value="userId" <#if 'userId'==model.systemUserAttr>selected</#if> >
<@locale code="userinfo.id"/></option>
<option value="employeeNumber" <#if 'employeeNumber'==model.systemUserAttr>selected</#if> >
<@locale code="userinfo.employeeNumber"/></option>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/userPropertys.ftl
View File

@@ -1,5 +1,5 @@
<select id="userPropertys" name="userPropertys" class="form-control multipleselect" multiple="multiple" >
<option value="uid" <#if model.userPropertys?contains("uid")>selected</#if> >
<option value="userId" <#if model.userPropertys?contains("userId")>selected</#if> >
<@locale code="userinfo.id" />
</option>
<option value="username" <#if model.userPropertys?contains("username")>selected</#if> >

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/historys/loginAppsHistoryList.ftl
View File

@@ -110,7 +110,7 @@
<tr>
<th data-sortable="true" data-field="id" data-visible="false"><@locale code="log.loginappshistory.id" /></th>
<th data-field="sessionId" ><@locale code="log.loginappshistory.sessionId" /></th>
<th data-field="uid" data-visible="false"><@locale code="log.loginappshistory.uid" /></th>
<th data-field="userId" data-visible="false"><@locale code="log.loginappshistory.uid" /></th>
<th data-field="username" ><@locale code="log.loginappshistory.username" /></th>
<th data-field="displayName" ><@locale code="log.loginappshistory.displayName" /></th>
<th data-field="appId" data-visible="false"><@locale code="log.loginappshistory.appId" /></th>

2
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
View File

@@ -32,7 +32,7 @@
console.log(seldata[0].id+" - "+seldata[0].fullName);
$(".username", window.parent.document).val(seldata[0].username);
$(".displayName", window.parent.document).val(seldata[0].displayName);
$(".uid", window.parent.document).val(seldata[0].id);
$(".userId", window.parent.document).val(seldata[0].id);
$.closeWindow();
});