去除注解.

This commit is contained in:
lijiahang
2024-07-18 15:39:31 +08:00
parent 48d308b1a8
commit a71456b209
38 changed files with 1 additions and 38 deletions

View File

@@ -44,7 +44,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/${package.ModuleName}/${typeHyphen}") @RequestMapping("/${package.ModuleName}/${typeHyphen}")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
#if(${superControllerClass}) #if(${superControllerClass})
public class ${table.controllerName} extends ${superControllerClass} { public class ${table.controllerName} extends ${superControllerClass} {
#else #else

View File

@@ -29,7 +29,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/command-snippet") @RequestMapping("/asset/command-snippet")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class CommandSnippetController { public class CommandSnippetController {
@Resource @Resource

View File

@@ -31,7 +31,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/command-snippet-group") @RequestMapping("/asset/command-snippet-group")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class CommandSnippetGroupController { public class CommandSnippetGroupController {
@Resource @Resource

View File

@@ -33,7 +33,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/exec-command") @RequestMapping("/asset/exec-command")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExecCommandController { public class ExecCommandController {
@Resource @Resource

View File

@@ -43,7 +43,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/exec-command-log") @RequestMapping("/asset/exec-command-log")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExecCommandLogController { public class ExecCommandLogController {
private static final String SOURCE = ExecSourceEnum.BATCH.name(); private static final String SOURCE = ExecSourceEnum.BATCH.name();

View File

@@ -34,7 +34,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/exec-job") @RequestMapping("/asset/exec-job")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExecJobController { public class ExecJobController {
@Resource @Resource

View File

@@ -42,7 +42,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/exec-job-log") @RequestMapping("/asset/exec-job-log")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExecJobLogController { public class ExecJobLogController {
private static final String SOURCE = ExecSourceEnum.JOB.name(); private static final String SOURCE = ExecSourceEnum.JOB.name();

View File

@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/exec-template") @RequestMapping("/asset/exec-template")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExecTemplateController { public class ExecTemplateController {
@Resource @Resource

View File

@@ -34,7 +34,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-config") @RequestMapping("/asset/host-config")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostConfigController { public class HostConfigController {
@Resource @Resource

View File

@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-connect-log") @RequestMapping("/asset/host-connect-log")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostConnectLogController { public class HostConnectLogController {
@Resource @Resource

View File

@@ -37,7 +37,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host") @RequestMapping("/asset/host")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostController { public class HostController {
@Resource @Resource

View File

@@ -29,7 +29,6 @@ import java.util.Map;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-extra") @RequestMapping("/asset/host-extra")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostExtraController { public class HostExtraController {
@Resource @Resource

View File

@@ -37,7 +37,6 @@ import java.util.Set;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-group") @RequestMapping("/asset/host-group")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostGroupController { public class HostGroupController {
@Resource @Resource

View File

@@ -37,7 +37,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-identity") @RequestMapping("/asset/host-identity")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostIdentityController { public class HostIdentityController {
@Resource @Resource

View File

@@ -37,7 +37,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-key") @RequestMapping("/asset/host-key")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostKeyController { public class HostKeyController {
@Resource @Resource

View File

@@ -38,7 +38,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-sftp") @RequestMapping("/asset/host-sftp")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostSftpLogController { public class HostSftpLogController {
@Resource @Resource

View File

@@ -30,7 +30,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/host-terminal") @RequestMapping("/asset/host-terminal")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HostTerminalController { public class HostTerminalController {
@Resource @Resource

View File

@@ -27,7 +27,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/path-bookmark") @RequestMapping("/asset/path-bookmark")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class PathBookmarkController { public class PathBookmarkController {
@Resource @Resource

View File

@@ -31,7 +31,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/path-bookmark-group") @RequestMapping("/asset/path-bookmark-group")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class PathBookmarkGroupController { public class PathBookmarkGroupController {
@Resource @Resource

View File

@@ -38,7 +38,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/asset/upload-task") @RequestMapping("/asset/upload-task")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class UploadTaskController { public class UploadTaskController {
@Resource @Resource

View File

@@ -287,7 +287,7 @@ public abstract class BaseExecCommandHandler implements IExecCommandHandler {
*/ */
protected String getErrorMessage(Exception ex) { protected String getErrorMessage(Exception ex) {
String message; String message;
if (ex instanceof InvalidArgumentException) { if (ex instanceof InvalidArgumentException || ex instanceof IllegalArgumentException) {
message = ex.getMessage(); message = ex.getMessage();
} else if (ex instanceof ConnectionRuntimeException) { } else if (ex instanceof ConnectionRuntimeException) {
message = "连接失败"; message = "连接失败";

View File

@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/auth") @RequestMapping("/infra/auth")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class AuthenticationController { public class AuthenticationController {
@Resource @Resource

View File

@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/dict-key") @RequestMapping("/infra/dict-key")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class DictKeyController { public class DictKeyController {
@Resource @Resource

View File

@@ -40,7 +40,6 @@ import java.util.Map;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/dict-value") @RequestMapping("/infra/dict-value")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class DictValueController { public class DictValueController {
@Resource @Resource

View File

@@ -32,7 +32,6 @@ import java.util.stream.Collectors;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/expression") @RequestMapping("/infra/expression")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class ExpressionController { public class ExpressionController {
@PermitAll @PermitAll

View File

@@ -27,7 +27,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/favorite") @RequestMapping("/infra/favorite")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class FavoriteController { public class FavoriteController {
@Resource @Resource

View File

@@ -33,7 +33,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/history-value") @RequestMapping("/infra/history-value")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class HistoryValueController { public class HistoryValueController {
@Resource @Resource

View File

@@ -39,7 +39,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/mine") @RequestMapping("/infra/mine")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class MineController { public class MineController {
@Resource @Resource

View File

@@ -34,7 +34,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/operator-log") @RequestMapping("/infra/operator-log")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class OperatorLogController { public class OperatorLogController {
@Resource @Resource

View File

@@ -32,7 +32,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/permission") @RequestMapping("/infra/permission")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class PermissionController { public class PermissionController {
@Resource @Resource

View File

@@ -29,7 +29,6 @@ import java.util.Map;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/preference") @RequestMapping("/infra/preference")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class PreferenceController { public class PreferenceController {
@Resource @Resource

View File

@@ -36,7 +36,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/system-menu") @RequestMapping("/infra/system-menu")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class SystemMenuController { public class SystemMenuController {
@Resource @Resource

View File

@@ -30,7 +30,6 @@ import java.util.Map;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/system-message") @RequestMapping("/infra/system-message")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class SystemMessageController { public class SystemMessageController {
@Resource @Resource

View File

@@ -40,7 +40,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/system-role") @RequestMapping("/infra/system-role")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class SystemRoleController { public class SystemRoleController {
@Resource @Resource

View File

@@ -28,7 +28,6 @@ import javax.annotation.Resource;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/system-setting") @RequestMapping("/infra/system-setting")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class SystemSettingController { public class SystemSettingController {
@Resource @Resource

View File

@@ -41,7 +41,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/system-user") @RequestMapping("/infra/system-user")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class SystemUserController { public class SystemUserController {
@Resource @Resource

View File

@@ -29,7 +29,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/tag") @RequestMapping("/infra/tag")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class TagController { public class TagController {
@Resource @Resource

View File

@@ -25,7 +25,6 @@ import java.util.List;
@RestWrapper @RestWrapper
@RestController @RestController
@RequestMapping("/infra/tips") @RequestMapping("/infra/tips")
@SuppressWarnings({"ELValidationInJSP", "SpringElInspection"})
public class TipsController { public class TipsController {
@Resource @Resource