This commit is contained in:
MaxKey
2023-08-15 14:05:39 +08:00
parent 79795a3b71
commit bf21605072
11 changed files with 13 additions and 11 deletions

View File

@@ -30,6 +30,7 @@ import org.dromara.maxkey.entity.apps.UserApps;
import org.dromara.maxkey.persistence.service.AccountsService;
import org.dromara.maxkey.persistence.service.AppsService;
import org.dromara.maxkey.persistence.service.UserInfoService;
import org.dromara.mybatis.jpa.query.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -92,7 +93,7 @@ public class AppListController {
Accounts account = null ;
if (credential.equalsIgnoreCase(Apps.CREDENTIALS.USER_DEFINED)) {
account = accountsService.load(new Accounts(currentUser.getId(), appId));
account = accountsService.load(Query.builder().eq("appId", appId).eq("userid", currentUser.getId()));
account.setRelatedPassword(
PasswordReciprocal.getInstance().decoder(
account.getRelatedPassword()));
@@ -115,7 +116,7 @@ public class AppListController {
@CurrentUser UserInfo currentUser) {
Accounts appUsers = new Accounts();
if (credential.equalsIgnoreCase(Apps.CREDENTIALS.USER_DEFINED)) {
appUsers = accountsService.load(new Accounts(currentUser.getId(), account.getAppId()));
appUsers = accountsService.load(Query.builder().eq("appId", account.getAppId()).eq("userid", currentUser.getId()));
if (appUsers == null) {
appUsers = new Accounts();
appUsers.setId(appUsers.generateId());

View File

@@ -69,7 +69,7 @@ public class RolesController {
public ResponseEntity<?> query(@ModelAttribute Roles role,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + role);
role.setInstId(currentUser.getInstId());
if (rolesService.load(role)!=null) {
if (rolesService.query(role)!=null) {
return new Message<Roles>(Message.SUCCESS).buildResponse();
} else {
return new Message<Roles>(Message.FAIL).buildResponse();

View File

@@ -80,7 +80,7 @@ public class ApplicationsController extends BaseAppContorller {
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<?> query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + apps);
if (appsService.load(apps)!=null) {
if (appsService.query(apps)!=null) {
return new Message<Apps>(Message.SUCCESS).buildResponse();
} else {
return new Message<Apps>(Message.SUCCESS).buildResponse();

View File

@@ -65,7 +65,7 @@ public class AccountsStrategyController {
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<?> query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + accountsStrategy);
if (accountsStrategyService.load(accountsStrategy)!=null) {
if (accountsStrategyService.query(accountsStrategy)!=null) {
return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();
} else {
return new Message<AccountsStrategy>(Message.SUCCESS).buildResponse();

View File

@@ -57,7 +57,7 @@ public class AdaptersController {
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<?> query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + appsAdapter);
if (appsAdaptersService.load(appsAdapter)!=null) {
if (appsAdaptersService.query(appsAdapter)!=null) {
return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();
} else {
return new Message<AppsAdapters>(Message.SUCCESS).buildResponse();

View File

@@ -60,7 +60,7 @@ public class SocialsProviderController {
public ResponseEntity<?> query(@ModelAttribute SocialsProvider socialsProvider,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + socialsProvider);
socialsProvider.setInstId(currentUser.getInstId());
if (socialsProviderService.load(socialsProvider)!=null) {
if (socialsProviderService.query(socialsProvider)!=null) {
return new Message<SocialsProvider>(Message.SUCCESS).buildResponse();
} else {
return new Message<SocialsProvider>(Message.SUCCESS).buildResponse();

View File

@@ -80,7 +80,7 @@ public class AccountsController {
public ResponseEntity<?> query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + account);
account.setInstId(currentUser.getInstId());
if (accountsService.load(account)!=null) {
if (accountsService.query(account)!=null) {
return new Message<Accounts>(Message.SUCCESS).buildResponse();
} else {
return new Message<Accounts>(Message.SUCCESS).buildResponse();

View File

@@ -106,7 +106,7 @@ public class UserAdjointController {
@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + userInfoAdjoint);
userInfoAdjoint.setInstId(currentUser.getInstId());
if (userInfoAdjointService.load(userInfoAdjoint)!=null) {
if (userInfoAdjointService.query(userInfoAdjoint)!=null) {
return new Message<UserInfoAdjoint>(Message.SUCCESS).buildResponse();
} else {

View File

@@ -99,7 +99,7 @@ public class UserInfoController {
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<?> query(@ModelAttribute UserInfo userInfo,@CurrentUser UserInfo currentUser) {
_logger.debug("-query :" + userInfo);
if (userInfoService.load(userInfo)!=null) {
if (userInfoService.query(userInfo)!=null) {
return new Message<UserInfo>(Message.SUCCESS).buildResponse();
} else {
return new Message<UserInfo>(Message.SUCCESS).buildResponse();