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

bug修复+代码调整+日志优化

Browse Source
This commit is contained in:
MaxKey
2024-09-29 07:10:13 +08:00
parent 65bc8c01b9
commit 8fe411648d
55 changed files with 724 additions and 5990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,11 +32,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
@RestController
@@ -50,9 +52,8 @@ public class AccessController {
@Autowired
HistorySystemLogsService systemLog;
@RequestMapping(value = { "/appsInGroup" })
@ResponseBody
public Message<?> appsInRole(
@GetMapping(value = { "/appsInGroup" })
public Message<JpaPageResults<Access>> appsInRole(
@ModelAttribute Access groupPermission,
@CurrentUser UserInfo currentUser) {
JpaPageResults<Access> groupPermissions;
@@ -64,12 +65,11 @@ public class AccessController {
app.transIconBase64();
}
}
return new Message<JpaPageResults<Access>>(Message.FAIL,groupPermissions);
return new Message<>(Message.FAIL,groupPermissions);
}
@RequestMapping(value = { "/appsNotInGroup" })
@ResponseBody
public Message<?> appsNotInRole(
@GetMapping(value = { "/appsNotInGroup" })
public Message<JpaPageResults<Access>> appsNotInRole(
@ModelAttribute Access groupPermission,
@CurrentUser UserInfo currentUser) {
JpaPageResults<Access> groupPermissions;
@@ -81,16 +81,15 @@ public class AccessController {
app.transIconBase64();
}
}
return new Message<JpaPageResults<Access>>(Message.FAIL,groupPermissions);
return new Message<>(Message.FAIL,groupPermissions);
}
@RequestMapping(value = {"/add"})
@ResponseBody
public Message<?> insertPermission(
@PostMapping(value = {"/add"})
public Message<Access> insertPermission(
@RequestBody Access groupPermission,
@CurrentUser UserInfo currentUser) {
if (groupPermission == null || groupPermission.getGroupId() == null) {
return new Message<Access>(Message.FAIL);
return new Message<>(Message.FAIL);
}
String roleId = groupPermission.getGroupId();
@@ -107,20 +106,19 @@ public class AccessController {
}
}
if(result) {
return new Message<Access>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
}
}
return new Message<Access>(Message.FAIL);
return new Message<>(Message.FAIL);
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Access> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {}" , ids);
if (accessService.deleteBatch(ids)) {
return new Message<Access>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Access>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}

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

@@ -20,6 +20,7 @@ package org.dromara.maxkey.web.apps.contorller;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsProtocols;
import org.dromara.maxkey.crypto.ReciprocalUtils;
@@ -30,14 +31,7 @@ import org.dromara.mybatis.jpa.entity.JpaPageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.JWEAlgorithm;
import com.nimbusds.jose.JWSAlgorithm;
@@ -54,19 +48,18 @@ import com.nimbusds.jose.jwk.gen.RSAKeyGenerator;
public class ApplicationsController extends BaseAppContorller {
static final Logger logger = LoggerFactory.getLogger(ApplicationsController.class);
@RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> init() {
@GetMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> init() {
Apps app=new Apps();
app.setId(app.generateId());
app.setProtocol(ConstsProtocols.BASIC);
app.setSecret(ReciprocalUtils.generateKey(""));
return new Message<Apps>(app);
return new Message<>(app);
}
@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
@GetMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<JpaPageResults<Apps>> fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
apps.setInstId(currentUser.getInstId());
JpaPageResults<Apps> appsList =appsService.fetchPageResults(apps);
for (Apps app : appsList.getRows()){
@@ -75,80 +68,73 @@ public class ApplicationsController extends BaseAppContorller {
app.setSharedPassword(null);
}
logger.debug("List {}" , appsList);
return new Message<JpaPageResults<Apps>>(appsList);
return new Message<>(appsList);
}
@ResponseBody
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
@GetMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> query(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) {
logger.debug("-query : {}" , apps);
if (appsService.query(apps)!=null) {
return new Message<Apps>(Message.SUCCESS);
if (CollectionUtils.isNotEmpty(appsService.query(apps))) {
return new Message<>(Message.SUCCESS);
} else {
return new Message<Apps>(Message.SUCCESS);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> get(@PathVariable("id") String id) {
Apps apps = appsService.get(id);
decoderSecret(apps);
apps.transIconBase64();
return new Message<Apps>(apps);
return new Message<>(apps);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> insert(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , apps);
transform(apps);
apps.setInstId(currentUser.getInstId());
if (appsService.insert(apps)) {
return new Message<Apps>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Apps>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> update(@RequestBody Apps apps,@CurrentUser UserInfo currentUser) {
logger.debug("-update : {}" , apps);
transform(apps);
apps.setInstId(currentUser.getInstId());
if (appsService.update(apps)) {
return new Message<Apps>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Apps>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Apps> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsService.deleteBatch(ids)) {
return new Message<Apps>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Apps>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value = { "/updateExtendAttr" })
public Message<?> updateExtendAttr(@RequestBody Apps app) {
@PostMapping({ "/updateExtendAttr" })
public Message<Apps> updateExtendAttr(@RequestBody Apps app) {
logger.debug("-updateExtendAttr id : {} , ExtendAttr : {}" , app.getId(),app.getExtendAttr());
if (appsService.updateExtendAttr(app)) {
return new Message<Apps>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Apps>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value = { "/generate/secret/{type}" })
public Message<?> generateSecret(@PathVariable("type") String type,@RequestParam(name="id",required=false) String id) throws JOSEException {
@GetMapping({ "/generate/secret/{type}" })
public Message<String> generateSecret(@PathVariable("type") String type,@RequestParam(name="id",required=false) String id) throws JOSEException {
String secret="";
type=type.toLowerCase();
if(type.equals("des")){
@@ -203,7 +189,7 @@ public class ApplicationsController extends BaseAppContorller {
secret=ReciprocalUtils.generateKey("");
}
return new Message<Object>(Message.SUCCESS,(Object)secret);
return new Message<>(Message.SUCCESS,secret);
}

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

@@ -30,12 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -46,57 +41,54 @@ public class CasDetailsController extends BaseAppContorller {
@Autowired
AppsCasDetailsService casDetailsService;
@RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> init() {
@GetMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> init() {
AppsCasDetails casDetails =new AppsCasDetails();
casDetails.setId(casDetails.generateId());
casDetails.setProtocol(ConstsProtocols.CAS);
casDetails.setSecret(ReciprocalUtils.generateKey(""));
return new Message<AppsCasDetails>(casDetails);
return new Message<>(casDetails);
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> get(@PathVariable("id") String id) {
AppsCasDetails casDetails=casDetailsService.getAppDetails(id , false);
super.decoderSecret(casDetails);
casDetails.transIconBase64();
return new Message<AppsCasDetails>(casDetails);
return new Message<>(casDetails);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> insert(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , casDetails);
transform(casDetails);
casDetails.setInstId(currentUser.getInstId());
if (casDetailsService.insert(casDetails)&&appsService.insertApp(casDetails)) {
return new Message<AppsCasDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsCasDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> update(@RequestBody AppsCasDetails casDetails,@CurrentUser UserInfo currentUser) {
logger.debug("-update : {}" , casDetails);
transform(casDetails);
casDetails.setInstId(currentUser.getInstId());
if (casDetailsService.update(casDetails)&&appsService.updateApp(casDetails)) {
return new Message<AppsCasDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsCasDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsCasDetails> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (casDetailsService.deleteBatch(ids)&&appsService.deleteBatch(ids)) {
return new Message<AppsCasDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsCasDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}

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

@@ -30,12 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -43,66 +38,61 @@ import org.springframework.web.bind.annotation.RestController;
public class ExtendApiDetailsController extends BaseAppContorller {
static final Logger logger = LoggerFactory.getLogger(ExtendApiDetailsController.class);
@RequestMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> init() {
@GetMapping(value = { "/init" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsExtendApiDetails> init() {
AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails();
extendApiDetails.setId(extendApiDetails.generateId());
extendApiDetails.setProtocol(ConstsProtocols.EXTEND_API);
extendApiDetails.setSecret(ReciprocalUtils.generateKey(""));
return new Message<AppsExtendApiDetails>(extendApiDetails);
return new Message<>(extendApiDetails);
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsExtendApiDetails> get(@PathVariable("id") String id) {
Apps application= appsService.get(id);
super.decoderSecret(application);
AppsExtendApiDetails extendApiDetails=new AppsExtendApiDetails();
BeanUtils.copyProperties(application, extendApiDetails);
extendApiDetails.transIconBase64();
return new Message<AppsExtendApiDetails>(extendApiDetails);
return new Message<>(extendApiDetails);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> add(
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsExtendApiDetails> add(
@RequestBody AppsExtendApiDetails extendApiDetails,
@CurrentUser UserInfo currentUser) {
logger.debug("-Add :" + extendApiDetails);
logger.debug("-Add : {}" , extendApiDetails);
transform(extendApiDetails);
extendApiDetails.setInstId(currentUser.getInstId());
if (appsService.insertApp(extendApiDetails)) {
return new Message<AppsExtendApiDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsExtendApiDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsExtendApiDetails> update(
@RequestBody AppsExtendApiDetails extendApiDetails,
@CurrentUser UserInfo currentUser) {
logger.debug("-update :" + extendApiDetails);
logger.debug("-update : {}" , extendApiDetails);
transform(extendApiDetails);
extendApiDetails.setInstId(currentUser.getInstId());
if (appsService.updateApp(extendApiDetails)) {
return new Message<AppsExtendApiDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsExtendApiDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(
@RequestParam("ids") List<String> ids,
@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsExtendApiDetails> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsService.deleteBatch(ids)) {
return new Message<AppsExtendApiDetails>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsExtendApiDetails>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}

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

@@ -19,6 +19,7 @@ package org.dromara.maxkey.web.config.contorller;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.AccountsStrategy;
import org.dromara.maxkey.entity.Message;
@@ -30,13 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value={"/config/accountsstrategy"})
@@ -49,69 +44,63 @@ public class AccountsStrategyController {
@Autowired
AccountsService accountsService;
@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
@GetMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<JpaPageResults<AccountsStrategy>> fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
accountsStrategy.setInstId(currentUser.getInstId());
JpaPageResults<AccountsStrategy> accountsStrategyList =accountsStrategyService.fetchPageResults(accountsStrategy);
for (AccountsStrategy strategy : accountsStrategyList.getRows()){
strategy.transIconBase64();
}
logger.debug("Accounts Strategy {}" , accountsStrategyList);
return new Message<JpaPageResults<AccountsStrategy>>(
accountsStrategyList);
return new Message<>(accountsStrategyList);
}
@ResponseBody
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
@GetMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AccountsStrategy> query(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
logger.debug("-query : {}" , accountsStrategy);
if (accountsStrategyService.query(accountsStrategy)!=null) {
return new Message<AccountsStrategy>(Message.SUCCESS);
if (CollectionUtils.isNotEmpty(accountsStrategyService.query(accountsStrategy))) {
return new Message<>(Message.SUCCESS);
} else {
return new Message<AccountsStrategy>(Message.SUCCESS);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AccountsStrategy> get(@PathVariable("id") String id) {
AccountsStrategy accountsStrategy = accountsStrategyService.get(id);
return new Message<AccountsStrategy>(accountsStrategy);
return new Message<>(accountsStrategy);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AccountsStrategy> insert(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , accountsStrategy);
if (accountsStrategyService.insert(accountsStrategy)) {
accountsService.refreshByStrategy(accountsStrategy);
return new Message<AccountsStrategy>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AccountsStrategy>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AccountsStrategy> update(@RequestBody AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) {
logger.debug("-update : {}" , accountsStrategy);
if (accountsStrategyService.update(accountsStrategy)) {
accountsService.refreshByStrategy(accountsStrategy);
return new Message<AccountsStrategy>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AccountsStrategy>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AccountsStrategy> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (accountsStrategyService.deleteBatch(ids)) {
return new Message<AccountsStrategy>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AccountsStrategy>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
}

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

@@ -19,6 +19,7 @@ package org.dromara.maxkey.web.config.contorller;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.entity.Message;
import org.dromara.maxkey.entity.apps.AppsAdapters;
@@ -29,13 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@@ -46,62 +41,57 @@ public class AdaptersController {
@Autowired
AppsAdaptersService appsAdaptersService;
@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> fetch(@ModelAttribute AppsAdapters appsAdapter) {
@GetMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<JpaPageResults<AppsAdapters>> fetch(@ModelAttribute AppsAdapters appsAdapter) {
logger.debug("fetch {}",appsAdapter);
return new Message<JpaPageResults<AppsAdapters>>(
return new Message<>(
appsAdaptersService.fetchPageResults(appsAdapter));
}
@ResponseBody
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
@GetMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsAdapters> query(@ModelAttribute AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
logger.debug("-query : {}" , appsAdapter);
if (appsAdaptersService.query(appsAdapter)!=null) {
return new Message<AppsAdapters>(Message.SUCCESS);
if (CollectionUtils.isNotEmpty(appsAdaptersService.query(appsAdapter))) {
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsAdapters>(Message.SUCCESS);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsAdapters> get(@PathVariable("id") String id) {
AppsAdapters appsAdapter=appsAdaptersService.get(id);
return new Message<AppsAdapters>(appsAdapter);
return new Message<>(appsAdapter);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsAdapters> insert(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , appsAdapter);
if (appsAdaptersService.insert(appsAdapter)) {
return new Message<AppsAdapters>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsAdapters>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsAdapters> update(@RequestBody AppsAdapters appsAdapter,@CurrentUser UserInfo currentUser) {
logger.debug("-update : {}" , appsAdapter);
if (appsAdaptersService.update(appsAdapter)) {
return new Message<AppsAdapters>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsAdapters>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<AppsAdapters> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (appsAdaptersService.deleteBatch(ids)) {
return new Message<AppsAdapters>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<AppsAdapters>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
}

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

@@ -28,10 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value={"/config/emailsenders"})
@@ -41,8 +38,8 @@ public class CnfEmailSendersController {
@Autowired
CnfEmailSendersService emailSendersService;
@RequestMapping(value={"/get"})
public Message<?> get(@CurrentUser UserInfo currentUser){
@GetMapping({"/get"})
public Message<CnfEmailSenders> get(@CurrentUser UserInfo currentUser){
CnfEmailSenders emailSenders = emailSendersService.get(currentUser.getInstId());
if(emailSenders != null && StringUtils.isNotBlank(emailSenders.getCredentials())) {
emailSenders.setCredentials(PasswordReciprocal.getInstance().decoder(emailSenders.getCredentials()));
@@ -51,27 +48,26 @@ public class CnfEmailSendersController {
emailSenders.setProtocol("smtp");
emailSenders.setEncoding("utf-8");
}
return new Message<CnfEmailSenders>(emailSenders);
return new Message<>(emailSenders);
}
@RequestMapping(value={"/update"})
@ResponseBody
public Message<?> update( @RequestBody CnfEmailSenders emailSenders,@CurrentUser UserInfo currentUser,BindingResult result) {
@PutMapping({"/update"})
public Message<CnfEmailSenders> update( @RequestBody CnfEmailSenders emailSenders,@CurrentUser UserInfo currentUser,BindingResult result) {
logger.debug("update emailSenders : {}" , emailSenders);
emailSenders.setInstId(currentUser.getInstId());
emailSenders.setCredentials(PasswordReciprocal.getInstance().encode(emailSenders.getCredentials()));
if(StringUtils.isBlank(emailSenders.getId())) {
emailSenders.setId(emailSenders.getInstId());
if(emailSendersService.insert(emailSenders)) {
return new Message<CnfEmailSenders>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
}else {
return new Message<CnfEmailSenders>(Message.ERROR);
return new Message<>(Message.ERROR);
}
}else {
if(emailSendersService.update(emailSenders)) {
return new Message<CnfEmailSenders>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
}else {
return new Message<CnfEmailSenders>(Message.ERROR);
return new Message<>(Message.ERROR);
}
}

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

@@ -31,10 +31,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value={"/config/ldapcontext"})
@@ -44,18 +41,17 @@ public class CnfLdapContextController {
@Autowired
CnfLdapContextService ldapContextService;
@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@CurrentUser UserInfo currentUser){
@GetMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<CnfLdapContext> get(@CurrentUser UserInfo currentUser){
CnfLdapContext ldapContext = ldapContextService.get(currentUser.getInstId());
if(ldapContext != null && StringUtils.isNoneBlank(ldapContext.getCredentials())) {
ldapContext.setCredentials(PasswordReciprocal.getInstance().decoder(ldapContext.getCredentials()));
}
return new Message<CnfLdapContext>(ldapContext);
return new Message<>(ldapContext);
}
@RequestMapping(value={"/update"})
@ResponseBody
public Message<?> update( @RequestBody CnfLdapContext ldapContext,@CurrentUser UserInfo currentUser,BindingResult result) {
@PutMapping({"/update"})
public Message<CnfLdapContext> update( @RequestBody CnfLdapContext ldapContext,@CurrentUser UserInfo currentUser,BindingResult result) {
logger.debug("update ldapContext : {}" ,ldapContext);
ldapContext.setCredentials(PasswordReciprocal.getInstance().encode(ldapContext.getCredentials()));
ldapContext.setInstId(currentUser.getInstId());
@@ -67,47 +63,49 @@ public class CnfLdapContextController {
updateResult = ldapContextService.update(ldapContext);
}
if(updateResult) {
return new Message<CnfLdapContext>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<CnfLdapContext>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value={"/test"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> test(@CurrentUser UserInfo currentUser){
@GetMapping(value={"/test"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<CnfLdapContext> test(@CurrentUser UserInfo currentUser){
CnfLdapContext ldapContext = ldapContextService.get(currentUser.getInstId());
if(ldapContext != null && StringUtils.isNoneBlank(ldapContext.getCredentials())) {
ldapContext.setCredentials(PasswordReciprocal.getInstance().decoder(ldapContext.getCredentials()));
}
LdapUtils ldapUtils = null;
if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.ActiveDirectory)) {
ldapUtils = new ActiveDirectoryUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn(),
ldapContext.getMsadDomain());
}else if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.OpenLDAP)) {
ldapUtils = new LdapUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn());
}else if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.StandardLDAP)) {
ldapUtils = new LdapUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn());
if(ldapContext != null) {
if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.ActiveDirectory)) {
ldapUtils = new ActiveDirectoryUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn(),
ldapContext.getMsadDomain());
}else if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.OpenLDAP)) {
ldapUtils = new LdapUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn());
}else if(ldapContext.getProduct().equalsIgnoreCase(LdapUtils.Product.StandardLDAP)) {
ldapUtils = new LdapUtils(
ldapContext.getProviderUrl(),
ldapContext.getPrincipal(),
ldapContext.getCredentials(),
ldapContext.getBasedn());
}
if(ldapUtils != null && ldapUtils.openConnection() != null) {
ldapUtils.close();
return new Message<>(Message.SUCCESS);
}
}
if(ldapUtils.openConnection() != null) {
ldapUtils.close();
return new Message<CnfLdapContext>(Message.SUCCESS);
}else {
return new Message<CnfLdapContext>(Message.FAIL);
}
return new Message<>(Message.FAIL);
}
}

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

@@ -29,10 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import jakarta.validation.Valid;
@RestController
@@ -43,21 +40,21 @@ public class CnfPasswordPolicyController {
@Autowired
CnfPasswordPolicyService passwordPolicyService;
@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@CurrentUser UserInfo currentUser){
@GetMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<CnfPasswordPolicy> get(@CurrentUser UserInfo currentUser){
CnfPasswordPolicy passwordPolicy = passwordPolicyService.get(currentUser.getInstId());
return new Message<CnfPasswordPolicy>(passwordPolicy);
return new Message<>(passwordPolicy);
}
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@Valid @RequestBody CnfPasswordPolicy passwordPolicy,@CurrentUser UserInfo currentUser,BindingResult result) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<CnfPasswordPolicy> update(@Valid @RequestBody CnfPasswordPolicy passwordPolicy,@CurrentUser UserInfo currentUser,BindingResult result) {
logger.debug("updateRole passwordPolicy : {}" ,passwordPolicy);
//Message message = this.validate(result, passwordPolicy);
if(passwordPolicyService.update(passwordPolicy)) {
return new Message<CnfPasswordPolicy>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<CnfPasswordPolicy>(Message.ERROR);
return new Message<>(Message.ERROR);
}
}

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

@@ -29,10 +29,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value={"/config/smsprovider"})
@@ -42,18 +39,17 @@ public class CnfSmsProviderController {
@Autowired
CnfSmsProviderService smsProviderService;
@RequestMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@CurrentUser UserInfo currentUser){
@GetMapping(value={"/get"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<CnfSmsProvider> get(@CurrentUser UserInfo currentUser){
CnfSmsProvider smsProvider = smsProviderService.get(currentUser.getInstId());
if(smsProvider != null && StringUtils.isNoneBlank(smsProvider.getId())) {
smsProvider.setAppSecret(PasswordReciprocal.getInstance().decoder(smsProvider.getAppSecret()));
}
return new Message<CnfSmsProvider>(smsProvider);
return new Message<>(smsProvider);
}
@RequestMapping(value={"/update"})
@ResponseBody
public Message<?> update( @RequestBody CnfSmsProvider smsProvider,@CurrentUser UserInfo currentUser,BindingResult result) {
@PutMapping({"/update"})
public Message<CnfSmsProvider> update( @RequestBody CnfSmsProvider smsProvider,@CurrentUser UserInfo currentUser,BindingResult result) {
logger.debug("update smsProvider : {}" ,smsProvider);
smsProvider.setAppSecret(PasswordReciprocal.getInstance().encode(smsProvider.getAppSecret()));
smsProvider.setInstId(currentUser.getInstId());
@@ -65,9 +61,9 @@ public class CnfSmsProviderController {
updateResult = smsProviderService.update(smsProvider);
}
if(updateResult) {
return new Message<CnfSmsProvider>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<CnfSmsProvider>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
}

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

@@ -31,12 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value={"/config/connectors"})
@@ -46,60 +41,55 @@ public class ConnectorsController {
@Autowired
ConnectorsService connectorsService;
@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> fetch(Connectors connector,@CurrentUser UserInfo currentUser) {
@GetMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<JpaPageResults<Connectors>> fetch(Connectors connector,@CurrentUser UserInfo currentUser) {
logger.debug("fetch {}" , connector);
connector.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Connectors>>(
connectorsService.fetchPageResults(connector));
return new Message<>(connectorsService.fetchPageResults(connector));
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Connectors> get(@PathVariable("id") String id) {
Connectors connector = connectorsService.get(id);
if(StringUtils.isNotBlank(connector.getCredentials())) {
connector.setCredentials(PasswordReciprocal.getInstance().decoder(connector.getCredentials()));
}
return new Message<Connectors>(connector);
return new Message<>(connector);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Connectors> insert(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) {
logger.debug("-Add : {}" , connector);
connector.setInstId(currentUser.getInstId());
if(StringUtils.isNotBlank(connector.getCredentials())) {
connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials()));
}
if (connectorsService.insert(connector)) {
return new Message<Connectors>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Connectors>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Connectors> update(@RequestBody Connectors connector,@CurrentUser UserInfo currentUser) {
logger.debug("-update : {}" , connector);
connector.setInstId(currentUser.getInstId());
connector.setCredentials(PasswordReciprocal.getInstance().encode(connector.getCredentials()));
if (connectorsService.update(connector)) {
return new Message<Connectors>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Connectors>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Connectors> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
logger.debug("-delete ids : {} " , ids);
if (connectorsService.deleteBatch(ids)) {
return new Message<Connectors>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Connectors>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}

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

@@ -19,6 +19,7 @@ package org.dromara.maxkey.web.contorller;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.dromara.maxkey.authn.annotation.CurrentUser;
import org.dromara.maxkey.constants.ConstsEntryType;
import org.dromara.maxkey.constants.ConstsAct;
@@ -38,12 +39,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
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.bind.annotation.RestController;
@@ -67,37 +71,34 @@ public class AccountsController {
@Autowired
HistorySystemLogsService systemLog;
@RequestMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> fetch(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
@GetMapping(value = { "/fetch" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<JpaPageResults<Accounts>> fetch(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
_logger.debug("fetch {}" , accounts);
accounts.setInstId(currentUser.getInstId());
return new Message<JpaPageResults<Accounts>>(
return new Message<>(
accountsService.fetchPageResults(accounts));
}
@ResponseBody
@RequestMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) {
@GetMapping(value={"/query"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> query(@ModelAttribute Accounts account,@CurrentUser UserInfo currentUser) {
_logger.debug("-query : {}" , account);
account.setInstId(currentUser.getInstId());
if (accountsService.query(account)!=null) {
return new Message<Accounts>(Message.SUCCESS);
if (CollectionUtils.isNotEmpty(accountsService.query(account))) {
return new Message<>(Message.SUCCESS);
} else {
return new Message<Accounts>(Message.SUCCESS);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> get(@PathVariable("id") String id) {
@GetMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> get(@PathVariable("id") String id) {
Accounts account=accountsService.get(id);
account.setRelatedPassword(PasswordReciprocal.getInstance().decoder(account.getRelatedPassword()));
return new Message<Accounts>(account);
return new Message<>(account);
}
@ResponseBody
@RequestMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> insert(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) {
@PostMapping(value={"/add"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> insert(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) {
_logger.debug("-Add : {}" , account);
account.setInstId(currentUser.getInstId());
account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword()));
@@ -108,15 +109,14 @@ public class AccountsController {
ConstsAct.CREATE,
ConstsActResult.SUCCESS,
currentUser);
return new Message<Accounts>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Accounts>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> update(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) {
@PutMapping(value={"/update"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> update(@RequestBody Accounts account,@CurrentUser UserInfo currentUser) {
_logger.debug("-update : {}" , account);
account.setInstId(currentUser.getInstId());
account.setRelatedPassword(PasswordReciprocal.getInstance().encode(account.getRelatedPassword()));
@@ -127,16 +127,15 @@ public class AccountsController {
ConstsAct.UPDATE,
ConstsActResult.SUCCESS,
currentUser);
return new Message<Accounts>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Accounts>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@RequestMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE})
@ResponseBody
public Message<?> updateStatus(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
@GetMapping(value = { "/updateStatus" }, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> updateStatus(@ModelAttribute Accounts accounts,@CurrentUser UserInfo currentUser) {
_logger.debug("accounts : {}" , accounts);
Accounts loadAccount = accountsService.get(accounts.getId());
accounts.setInstId(currentUser.getInstId());
@@ -153,15 +152,14 @@ public class AccountsController {
ConstsAct.statusActon.get(accounts.getStatus()),
ConstsActResult.SUCCESS,
currentUser);
return new Message<Accounts>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Accounts>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<?> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
@DeleteMapping(value={"/delete"}, produces = {MediaType.APPLICATION_JSON_VALUE})
public Message<Accounts> delete(@RequestParam("ids") List<String> ids,@CurrentUser UserInfo currentUser) {
_logger.debug("-delete ids : {} " , ids);
if (accountsService.deleteBatch(ids)) {
@@ -171,21 +169,19 @@ public class AccountsController {
ConstsAct.DELETE,
ConstsActResult.SUCCESS,
currentUser);
return new Message<Accounts>(Message.SUCCESS);
return new Message<>(Message.SUCCESS);
} else {
return new Message<Accounts>(Message.FAIL);
return new Message<>(Message.FAIL);
}
}
@ResponseBody
@RequestMapping(value = "/generate")
public Message<?> generate(@ModelAttribute Accounts account) {
@GetMapping(value = "/generate")
public Message<String> generate(@ModelAttribute Accounts account) {
AccountsStrategy accountsStrategy = accountsStrategyService.get(account.getStrategyId());
UserInfo userInfo = userInfoService.get(account.getUserId());
return new Message<Object>(
Message.SUCCESS,
(Object)accountsService.generateAccount(userInfo,accountsStrategy)
return new Message<>(
Message.SUCCESS,accountsService.generateAccount(userInfo,accountsStrategy)
);
}