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

jdk 17

Browse Source
This commit is contained in:
MaxKey
2023-08-15 11:58:38 +08:00
parent 7ebf4a57f3
commit d2500690e2
255 changed files with 1092 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxkey-webs/maxkey-gataway/src/main/resources/application.yml
View File

@@ -1,7 +1,7 @@
#端口号
application:
name: maxkey-gateway-server
formatted-version: v3.5.19 GA
formatted-version: v4.0.0 GA
server:
port: 9000
spring:

5
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java
View File

@@ -17,11 +17,10 @@
package org.dromara.maxkey;
import javax.servlet.ServletException;
import org.apache.ibatis.io.VFS;
import org.apache.mybatis.jpa.SpringBootVFS;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.web.InitializeContext;
import org.dromara.mybatis.jpa.starter.SpringBootVFS;
import org.joda.time.DateTime;
import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
@@ -33,6 +32,8 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.ConfigurableApplicationContext;
import jakarta.servlet.ServletException;
@SpringBootApplication
@EnableDiscoveryClient
@MapperScan("org.maxkey.persistence.mapper,")

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

@@ -19,7 +19,6 @@ package org.dromara.maxkey.web.access.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.authn.session.SessionManager;
import org.dromara.maxkey.entity.HistoryLogin;
@@ -28,6 +27,7 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

5
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java
View File

@@ -21,9 +21,6 @@ import java.text.ParseException;
import java.util.HashMap;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.LoginCredential;
import org.dromara.maxkey.authn.jwt.AuthJwt;
@@ -56,6 +53,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* @author Crystal.Sea

3
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java
View File

@@ -21,8 +21,6 @@ import java.util.Iterator;
import java.util.Set;
import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.authn.session.Session;
@@ -48,6 +46,7 @@ import org.springframework.web.servlet.ModelAndView;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
@Tag(name = "1-3-单点注销接口文档模块")
@Controller

3
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java
View File

@@ -20,7 +20,6 @@ package org.dromara.maxkey.web.contorller;
import java.io.IOException;
import java.util.regex.Pattern;
import javax.servlet.ServletException;
import org.dromara.maxkey.authn.jwt.AuthTokenService;
import org.dromara.maxkey.configuration.ApplicationConfig;
@@ -45,6 +44,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import jakarta.servlet.ServletException;
@Controller
@RequestMapping(value={"/signup"})

6
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java
View File

@@ -17,9 +17,6 @@
package org.dromara.maxkey.web.contorller;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsTimeInterval;
import org.dromara.maxkey.entity.Message;
@@ -37,6 +34,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@Controller
@RequestMapping(value={"/safe"})
public class SafeController {

4
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistoryLoginApps;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginAppsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +67,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController
historyLoginApp.setUserId(currentUser.getId());
historyLoginApp.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistoryLoginApps>>(
historyLoginAppsService.queryPageResults(historyLoginApp)
historyLoginAppsService.fetchPageResults(historyLoginApp)
).buildResponse();
}

4
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistoryLogin;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +67,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla
historyLogin.setInstId(currentUser.getInstId());
historyLogin.setUserId(currentUser.getId());
return new Message<JpaPageResults<HistoryLogin>>(
loginHistoryService.queryPageResults(historyLogin)
loginHistoryService.fetchPageResults(historyLogin)
).buildResponse();
}

6
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java
View File

@@ -17,9 +17,6 @@
package org.dromara.maxkey.web.interceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
import org.dromara.maxkey.entity.HistoryLoginApps;
@@ -36,6 +33,9 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@Component
public class HistorySignOnAppInterceptor implements AsyncHandlerInterceptor {
private static final Logger _logger = LoggerFactory.getLogger(HistorySignOnAppInterceptor.class);

5
maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java
View File

@@ -16,8 +16,6 @@
package org.dromara.maxkey.web.interceptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.SignPrincipal;
import org.dromara.maxkey.authn.jwt.AuthTokenService;
@@ -40,6 +38,9 @@ import org.springframework.security.web.util.UrlUtils;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@Component
public class SingleSignOnInterceptor implements AsyncHandlerInterceptor {
private static final Logger _logger = LoggerFactory.getLogger(SingleSignOnInterceptor.class);

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

@@ -16,7 +16,7 @@
#MaxKey Title and Version #
############################################################################
application.title =MaxKey
application.formatted-version =v3.5.19 GA
application.formatted-version =v4.0.0 GA
#for dynamic service discovery
spring.application.name =maxkey
############################################################################

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java
View File

@@ -17,8 +17,6 @@
package org.dromara.maxkey;
import javax.servlet.ServletException;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.web.InitializeContext;
import org.joda.time.DateTime;
@@ -33,6 +31,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import jakarta.servlet.ServletException;
@ComponentScan(basePackages = {
"org.maxkey.authn",
"org.maxkey.configuration",

8
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java
View File

@@ -17,7 +17,6 @@
package org.dromara.maxkey.web.access.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.RoleMember;
@@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.RolesService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +67,7 @@ public class RoleMemberController {
_logger.debug("fetch "+roleMember);
roleMember.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<RoleMember>>(
roleMemberService.queryPageResults(roleMember)).buildResponse();
roleMemberService.fetchPageResults(roleMember)).buildResponse();
}
@RequestMapping(value = { "/memberInRole" })
@@ -76,7 +76,7 @@ public class RoleMemberController {
_logger.debug("roleMember : "+roleMember);
roleMember.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<RoleMember>>(
roleMemberService.queryPageResults("memberInRole",roleMember)).buildResponse();
roleMemberService.fetchPageResults("memberInRole",roleMember)).buildResponse();
}
@@ -86,7 +86,7 @@ public class RoleMemberController {
public ResponseEntity<?> memberNotInRole(@ModelAttribute RoleMember roleMember,@CurrentUser UserInfo currentUser) {
roleMember.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<RoleMember>>(
roleMemberService.queryPageResults("memberNotInRole",roleMember)).buildResponse();
roleMemberService.fetchPageResults("memberNotInRole",roleMember)).buildResponse();
}
@RequestMapping(value = { "/rolesNoMember" })

6
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java
View File

@@ -16,7 +16,6 @@
package org.dromara.maxkey.web.access.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.RolePermissions;
@@ -25,6 +24,7 @@ import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.RolePermissionssService;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class RolePermissionsController {
@CurrentUser UserInfo currentUser) {
JpaPageResults<RolePermissions> rolePermissions;
rolePermission.setInstId(currentUser.getInstId());
rolePermissions= rolePermissionssService.queryPageResults("appsInRole",rolePermission);
rolePermissions= rolePermissionssService.fetchPageResults("appsInRole",rolePermission);
if(rolePermissions!=null&&rolePermissions.getRows()!=null){
for (Apps app : rolePermissions.getRows()){
@@ -72,7 +72,7 @@ public class RolePermissionsController {
@CurrentUser UserInfo currentUser) {
JpaPageResults<RolePermissions> rolePermissions;
rolePermission.setInstId(currentUser.getInstId());
rolePermissions= rolePermissionssService.queryPageResults("appsNotInRole",rolePermission);
rolePermissions= rolePermissionssService.fetchPageResults("appsNotInRole",rolePermission);
if(rolePermissions!=null&&rolePermissions.getRows()!=null){
for (Apps app : rolePermissions.getRows()){

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java
View File

@@ -17,7 +17,6 @@
package org.dromara.maxkey.web.access.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsEntryType;
import org.dromara.maxkey.constants.ConstsOperateAction;
@@ -28,6 +27,7 @@ import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.RolesService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +61,7 @@ public class RolesController {
_logger.debug(""+role);
role.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Roles>>(
rolesService.queryPageResults(role)).buildResponse();
rolesService.fetchPageResults(role)).buildResponse();
}
@ResponseBody

2
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java
View File

@@ -19,7 +19,6 @@ package org.dromara.maxkey.web.access.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.authn.session.SessionManager;
import org.dromara.maxkey.entity.HistoryLogin;
@@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.HistoryLoginService;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java
View File

@@ -18,13 +18,13 @@
package org.dromara.maxkey.web.apps.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsProtocols;
import org.dromara.maxkey.crypto.ReciprocalUtils;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.apps.Apps;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
@@ -66,7 +66,7 @@ public class ApplicationsController extends BaseAppContorller {
@ResponseBody
public ResponseEntity<?> fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
apps.setInstId(currentUser.getInstId());
JpaPageResults<Apps> appsList =appsService.queryPageResults(apps);
JpaPageResults<Apps> appsList =appsService.fetchPageResults(apps);
for (Apps app : appsList.getRows()){
app.transIconBase64();
app.setSecret(null);

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java
View File

@@ -17,13 +17,13 @@
package org.dromara.maxkey.web.config.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.AccountsStrategy;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.AccountsService;
import org.dromara.maxkey.persistence.service.AccountsStrategyService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ public class AccountsStrategyController {
@ResponseBody
public ResponseEntity<?> fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
accountsStrategy.setInstId(currentUser.getInstId());
JpaPageResults<AccountsStrategy> accountsStrategyList =accountsStrategyService.queryPageResults(accountsStrategy);
JpaPageResults<AccountsStrategy> accountsStrategyList =accountsStrategyService.fetchPageResults(accountsStrategy);
for (AccountsStrategy strategy : accountsStrategyList.getRows()){
strategy.transIconBase64();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java
View File

@@ -17,12 +17,12 @@
package org.dromara.maxkey.web.config.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.apps.AppsAdapters;
import org.dromara.maxkey.persistence.service.AppsAdaptersService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +50,7 @@ public class AdaptersController {
public ResponseEntity<?> fetch(@ModelAttribute AppsAdapters appsAdapter) {
_logger.debug(""+appsAdapter);
return new Message<JpaPageResults<AppsAdapters>>(
appsAdaptersService.queryPageResults(appsAdapter)).buildResponse();
appsAdaptersService.fetchPageResults(appsAdapter)).buildResponse();
}
@ResponseBody

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java
View File

@@ -18,13 +18,13 @@
package org.dromara.maxkey.web.config.contorller;
import org.apache.commons.lang3.StringUtils;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Connectors;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.ConnectorsService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,7 +51,7 @@ public class ConnectorsController {
_logger.debug(""+connector);
connector.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Connectors>>(
connectorsService.queryPageResults(connector)).buildResponse();
connectorsService.fetchPageResults(connector)).buildResponse();
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})

3
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java
View File

@@ -17,7 +17,6 @@
package org.dromara.maxkey.web.config.contorller;
import javax.validation.Valid;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
@@ -35,6 +34,8 @@ import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import jakarta.validation.Valid;
@Controller
@RequestMapping(value={"/config/passwordpolicy"})
public class PasswordPolicyController {

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java
View File

@@ -17,13 +17,13 @@
package org.dromara.maxkey.web.config.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.SocialsProvider;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.SocialsProviderService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +52,7 @@ public class SocialsProviderController {
_logger.debug(""+socialsProvider);
socialsProvider.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<SocialsProvider>>(
socialsProviderService.queryPageResults(socialsProvider)).buildResponse();
socialsProviderService.fetchPageResults(socialsProvider)).buildResponse();
}
@ResponseBody

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java
View File

@@ -19,7 +19,6 @@ package org.dromara.maxkey.web.config.contorller;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
import org.dromara.maxkey.entity.Message;
@@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.SynchronizersService;
import org.dromara.maxkey.synchronizer.ISynchronizerService;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class SynchronizersController {
_logger.debug(""+synchronizers);
synchronizers.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Synchronizers>>(
synchronizersService.queryPageResults(synchronizers)).buildResponse();
synchronizersService.fetchPageResults(synchronizers)).buildResponse();
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java
View File

@@ -17,7 +17,6 @@
package org.dromara.maxkey.web.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsEntryType;
import org.dromara.maxkey.constants.ConstsOperateAction;
@@ -32,6 +31,7 @@ import org.dromara.maxkey.persistence.service.AccountsStrategyService;
import org.dromara.maxkey.persistence.service.AppsService;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +72,7 @@ public class AccountsController {
_logger.debug(""+accounts);
accounts.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Accounts>>(
accountsService.queryPageResults(accounts)).buildResponse();
accountsService.fetchPageResults(accounts)).buildResponse();
}
@ResponseBody

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java
View File

@@ -17,8 +17,6 @@
package org.dromara.maxkey.web.contorller;
import javax.servlet.http.HttpServletRequest;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.authn.session.SessionManager;
import org.dromara.maxkey.entity.Message;
@@ -31,6 +29,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import jakarta.servlet.http.HttpServletRequest;
@Controller
public class LogoutEndpoint {
private static Logger _logger = LoggerFactory.getLogger(LogoutEndpoint.class);

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java
View File

@@ -24,7 +24,6 @@ import java.util.List;
import java.util.TreeSet;
import java.util.stream.Collectors;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -41,6 +40,7 @@ import org.dromara.maxkey.persistence.service.OrganizationsService;
import org.dromara.maxkey.util.ExcelUtils;
import org.dromara.maxkey.web.component.TreeAttributes;
import org.dromara.maxkey.web.component.TreeNode;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +74,7 @@ public class OrganizationsController {
_logger.debug("fetch {}" , org);
org.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Organizations>>(
organizationsService.queryPageResults(org)).buildResponse();
organizationsService.fetchPageResults(org)).buildResponse();
}
@ResponseBody

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java
View File

@@ -17,12 +17,12 @@
package org.dromara.maxkey.web.contorller;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.entity.UserInfoAdjoint;
import org.dromara.maxkey.persistence.service.UserInfoAdjointService;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +59,7 @@ public class UserAdjointController {
@CurrentUser UserInfo currentUser){
_logger.debug(""+userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
return userInfoAdjointService.queryPageResults(userInfoAdjoint);
return userInfoAdjointService.fetchPageResults(userInfoAdjoint);
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java
View File

@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.TreeSet;
import java.util.stream.Collectors;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -50,6 +49,7 @@ import org.dromara.maxkey.util.ExcelUtils;
import org.dromara.maxkey.util.JsonUtils;
import org.dromara.maxkey.util.StringUtils;
import org.dromara.maxkey.web.WebContext;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +92,7 @@ public class UserInfoController {
_logger.debug(""+userInfo);
userInfo.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<UserInfo>>(
userInfoService.queryPageResults(userInfo)).buildResponse();
userInfoService.fetchPageResults(userInfo)).buildResponse();
}
@ResponseBody

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistoryConnector;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryConnectorService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(ConnectorHistoryController
_logger.debug("historys/historyConnector/fetch/ {}",historyConnector);
historyConnector.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistoryConnector>>(
historyConnectorService.queryPageResults(historyConnector)
historyConnectorService.fetchPageResults(historyConnector)
).buildResponse();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistoryLoginApps;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginAppsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController
historyLoginApp.setId(null);
historyLoginApp.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistoryLoginApps>>(
historyLoginAppsService.queryPageResults(historyLoginApp)
historyLoginAppsService.fetchPageResults(historyLoginApp)
).buildResponse();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistoryLogin;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistoryLoginService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla
_logger.debug("historys/loginHistory/fetch/ {}",historyLogin);
historyLogin.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistoryLogin>>(
loginHistoryService.queryPageResults(historyLogin)
loginHistoryService.fetchPageResults(historyLogin)
).buildResponse();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistorySynchronizer;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistorySynchronizerService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ final static Logger _logger = LoggerFactory.getLogger(SynchronizerHistoryControl
_logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer);
historySynchronizer.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistorySynchronizer>>(
historySynchronizerService.queryPageResults(historySynchronizer)
historySynchronizerService.fetchPageResults(historySynchronizer)
).buildResponse();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java
View File

@@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.HistorySystemLogs;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.UserInfo;
import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.util.DateUtils;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +65,7 @@ final static Logger _logger = LoggerFactory.getLogger(SystemLogsController.class
_logger.debug("historys/historyLog/fetch {} ",historyLog);
historyLog.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<HistorySystemLogs>>(
historySystemLogsService.queryPageResults(historyLog)
historySystemLogsService.fetchPageResults(historyLog)
).buildResponse();
}

4
maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java
View File

@@ -19,7 +19,6 @@ package org.dromara.maxkey.web.permissions.contorller;
import java.util.List;
import org.apache.mybatis.jpa.persistence.JpaPageResults;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsEntryType;
import org.dromara.maxkey.constants.ConstsOperateAction;
@@ -31,6 +30,7 @@ import org.dromara.maxkey.persistence.service.HistorySystemLogsService;
import org.dromara.maxkey.persistence.service.ResourcesService;
import org.dromara.maxkey.web.component.TreeAttributes;
import org.dromara.maxkey.web.component.TreeNode;
import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +62,7 @@ public class ResourcesController {
_logger.debug("fetch {}" , resource);
resource.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Resources>>(
resourcesService.queryPageResults(resource)).buildResponse();
resourcesService.fetchPageResults(resource)).buildResponse();
}
@ResponseBody

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

@@ -16,7 +16,7 @@
#MaxKey Title and Version #
############################################################################
application.title =MaxKey-Mgt
application.formatted-version =v3.5.19 GA
application.formatted-version =v4.0.0 GA
#for dynamic service discovery
spring.application.name =maxkey-mgt
############################################################################

3
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java
View File

@@ -17,7 +17,6 @@
package org.dromara.maxkey;
import javax.servlet.ServletException;
import org.dromara.maxkey.configuration.ApplicationConfig;
import org.dromara.maxkey.web.InitializeContext;
@@ -33,6 +32,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan;
import jakarta.servlet.ServletException;
@ComponentScan(basePackages = {
"org.maxkey.authn",
"org.maxkey.configuration",

8
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java
View File

@@ -19,10 +19,6 @@ package org.dromara.maxkey.web.interceptor;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication;
import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices;
import org.dromara.maxkey.crypto.password.PasswordReciprocal;
@@ -33,6 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* OAuth v2.0 accessToken认证Interceptor处理.
* @author Crystal.Sea

7
maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java
View File

@@ -18,9 +18,6 @@
package org.dromara.maxkey.web.interceptor;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.dromara.maxkey.authn.web.AuthorizationUtils;
import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication;
@@ -37,6 +34,10 @@ import org.springframework.security.core.userdetails.User;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.AsyncHandlerInterceptor;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
/**
* basic认证Interceptor处理.
* @author Crystal.Sea

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

@@ -16,7 +16,7 @@
#MaxKey Title and Version #
############################################################################
application.title =MaxKey-OpenApi
application.formatted-version =v3.5.19 GA
application.formatted-version =v4.0.0 GA
#for dynamic service discovery
spring.application.name =maxkey-openapi
############################################################################