diff --git a/src/main/java/com/easysoftware/adapter/MyErrorController.java b/src/main/java/com/easysoftware/adapter/MyErrorController.java index 39dd7fae86b7b65260ccf7af82c6ff13447772c8..a5430410ecae7313cd768296eab73abd06cc7b8e 100644 --- a/src/main/java/com/easysoftware/adapter/MyErrorController.java +++ b/src/main/java/com/easysoftware/adapter/MyErrorController.java @@ -1,10 +1,13 @@ package com.easysoftware.adapter; import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.easysoftware.domain.common.utils.HttpResult; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -14,9 +17,9 @@ public class MyErrorController implements ErrorController{ private final String ERROR_PATH = "/error"; @RequestMapping(value = ERROR_PATH) - public String errorHtml(HttpServletRequest request, HttpServletResponse response) { + public ResponseEntity errorHtml(HttpServletRequest request, HttpServletResponse response) { int status = response.getStatus(); - return HttpResult.fail(status, "error uri", ""); + return ResultUtil.fail(HttpStatus.NOT_FOUND, MessageCode.EC0001); } } diff --git a/src/main/java/com/easysoftware/adapter/query/ApplicationPackageAdapter.java b/src/main/java/com/easysoftware/adapter/query/ApplicationPackageAdapter.java index 35a1c0fdf09ebb1ca3db5fbdb23e62c194d18791..fa7861ef6d3d54ec0ea9c739e21076c05dbdd113 100644 --- a/src/main/java/com/easysoftware/adapter/query/ApplicationPackageAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/ApplicationPackageAdapter.java @@ -3,6 +3,7 @@ package com.easysoftware.adapter.query; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -25,26 +26,26 @@ public class ApplicationPackageAdapter { private ApplicationPackageService appPkgService; @PostMapping("") - public String insertAppPkg(@Valid @RequestBody InputApplicationPackage inputAppPackage) { - String res = appPkgService.insertAppPkg(inputAppPackage); + public ResponseEntity insertAppPkg(@Valid @RequestBody InputApplicationPackage inputAppPackage) { + ResponseEntity res = appPkgService.insertAppPkg(inputAppPackage); return res; } @PutMapping() - public String updateAppPkg(@Valid @RequestBody InputApplicationPackage inputAppPackage) { - String res = appPkgService.updateAppPkg(inputAppPackage); + public ResponseEntity updateAppPkg(@Valid @RequestBody InputApplicationPackage inputAppPackage) { + ResponseEntity res = appPkgService.updateAppPkg(inputAppPackage); return res; } @DeleteMapping(value = "/{names}") - public String deleteAppPkg(@PathVariable List names) { - String res = appPkgService.deleteAppPkg(names); + public ResponseEntity deleteAppPkg(@PathVariable List names) { + ResponseEntity res = appPkgService.deleteAppPkg(names); return res; } @GetMapping() - public String searchAppPkg(@Valid ApplicationPackageSearchCondition condition) { - String res = appPkgService.searchAppPkg(condition); + public ResponseEntity searchAppPkg(@Valid ApplicationPackageSearchCondition condition) { + ResponseEntity res = appPkgService.searchAppPkg(condition); return res; } diff --git a/src/main/java/com/easysoftware/adapter/query/RPMPackageAdapter.java b/src/main/java/com/easysoftware/adapter/query/RPMPackageAdapter.java index 7f6689d2335f4e6a54f5c32ba4ad7a5cc68d246d..619d85768e516f9d1d7edf800cddeee37667da0e 100644 --- a/src/main/java/com/easysoftware/adapter/query/RPMPackageAdapter.java +++ b/src/main/java/com/easysoftware/adapter/query/RPMPackageAdapter.java @@ -3,6 +3,7 @@ package com.easysoftware.adapter.query; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -28,26 +29,26 @@ public class RPMPackageAdapter { private RPMPackageService rPMPkgService; @PostMapping("") - public String insertRPMPkg(@Valid @RequestBody InputRPMPackage inputrPMPackage) { - String res = rPMPkgService.insertRPMPkg(inputrPMPackage); + public ResponseEntity insertRPMPkg(@Valid @RequestBody InputRPMPackage inputrPMPackage) { + ResponseEntity res = rPMPkgService.insertRPMPkg(inputrPMPackage); return res; } @PutMapping() - public String updateRPMPkg(@Valid @RequestBody InputRPMPackage inputrPMPackage) { - String res = rPMPkgService.updateRPMPkg(inputrPMPackage); + public ResponseEntity updateRPMPkg(@Valid @RequestBody InputRPMPackage inputrPMPackage) { + ResponseEntity res = rPMPkgService.updateRPMPkg(inputrPMPackage); return res; } @DeleteMapping(value = "/{names}") - public String deleteRPMPkg(@PathVariable List names) { - String res = rPMPkgService.deleteRPMPkg(names); + public ResponseEntity deleteRPMPkg(@PathVariable List names) { + ResponseEntity res = rPMPkgService.deleteRPMPkg(names); return res; } @GetMapping() - public String searchRPMPkg(@Valid RPMPackageSearchCondition condition) { - String res = rPMPkgService.searchRPMPkg(condition); + public ResponseEntity searchRPMPkg(@Valid RPMPackageSearchCondition condition) { + ResponseEntity res = rPMPkgService.searchRPMPkg(condition); return res; } } diff --git a/src/main/java/com/easysoftware/aop/LimitRequestAspect.java b/src/main/java/com/easysoftware/aop/LimitRequestAspect.java index e32b7783b0b8f2a21687b7d0046d7b5f8de3151a..310c2706fdecedf31b2e3d7cc7bf301223938b7d 100644 --- a/src/main/java/com/easysoftware/aop/LimitRequestAspect.java +++ b/src/main/java/com/easysoftware/aop/LimitRequestAspect.java @@ -11,8 +11,8 @@ import org.aspectj.lang.annotation.Pointcut; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; -import com.easysoftware.result.MessageCode; -import com.easysoftware.result.Result; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; @Aspect @Component @@ -27,7 +27,7 @@ public class LimitRequestAspect { @Around(value = "exudeService(limitRequest)", argNames = "joinPoint,limitRequest") public Object before(ProceedingJoinPoint joinPoint, LimitRequest limitRequest) throws Throwable { if (!isAllowed(joinPoint.getSignature().getName(), limitRequest)) { - return Result.fail(HttpStatus.TOO_MANY_REQUESTS, MessageCode.EC00010); + return ResultUtil.fail(HttpStatus.TOO_MANY_REQUESTS, MessageCode.EC00010); } return joinPoint.proceed(); diff --git a/src/main/java/com/easysoftware/vo/ManagementLog.java b/src/main/java/com/easysoftware/aop/ManagementLog.java similarity index 94% rename from src/main/java/com/easysoftware/vo/ManagementLog.java rename to src/main/java/com/easysoftware/aop/ManagementLog.java index 55a5543f2f5f485bc1f46f6802a02ab7c02b42ae..5f1476375c4a89b4566fb67d66de030e7da6d13d 100644 --- a/src/main/java/com/easysoftware/vo/ManagementLog.java +++ b/src/main/java/com/easysoftware/aop/ManagementLog.java @@ -1,4 +1,4 @@ -package com.easysoftware.vo; +package com.easysoftware.aop; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/easysoftware/aop/ManagementLogAOP.java b/src/main/java/com/easysoftware/aop/ManagementLogAOP.java index 38dcd0aee9a028c1d7a212a9b552ce20afd89689..b923edbf5b96d9b9745492bc303d386d0642cf12 100644 --- a/src/main/java/com/easysoftware/aop/ManagementLogAOP.java +++ b/src/main/java/com/easysoftware/aop/ManagementLogAOP.java @@ -7,7 +7,7 @@ import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.easysoftware.utils.LogUtil; +import com.easysoftware.common.utils.LogUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/easysoftware/application/GlobalExceptionHandler.java b/src/main/java/com/easysoftware/application/GlobalExceptionHandler.java index cc59104cfd0a7755a2dfc50011d8ade5dd1fa0c0..78e7eba5c4f9747ce03e349e284de0706aef4ff2 100644 --- a/src/main/java/com/easysoftware/application/GlobalExceptionHandler.java +++ b/src/main/java/com/easysoftware/application/GlobalExceptionHandler.java @@ -5,8 +5,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.easysoftware.result.MessageCode; -import com.easysoftware.result.Result; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,6 +23,6 @@ public class GlobalExceptionHandler { public ResponseEntity exception(MethodArgumentNotValidException e) { logger.error(MessageCode.EC0001.getMsgEn(), e); MessageCode messageCode = MessageCode.msgCodeMap.get(e.getMessage()); - return Result.fail(HttpStatus.BAD_REQUEST, messageCode); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, messageCode); } } diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java index 3c6a9a0d038fd981701fdb8de000d132de625429..a8f5e57b4e8502afdf34ff3a2e17e9468f68bea6 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageService.java @@ -2,12 +2,14 @@ package com.easysoftware.application.applicationpackage; import java.util.List; +import org.springframework.http.ResponseEntity; + import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; public interface ApplicationPackageService { - String insertAppPkg(InputApplicationPackage listApp); - String updateAppPkg(InputApplicationPackage inputAppPackage); - String deleteAppPkg(List names); - String searchAppPkg(ApplicationPackageSearchCondition condition); + ResponseEntity insertAppPkg(InputApplicationPackage listApp); + ResponseEntity updateAppPkg(InputApplicationPackage inputAppPackage); + ResponseEntity deleteAppPkg(List names); + ResponseEntity searchAppPkg(ApplicationPackageSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java index 14f647dc5a347209cb43cf67bc6efbea8f3b0f69..783b0d14bb2eea33c44be69dee98c6cee2bbae2d 100644 --- a/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationpackage/ApplicationPackageServiceImpl.java @@ -4,13 +4,15 @@ import java.util.List; import org.springframework.beans.BeanUtils; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; import com.easysoftware.application.applicationpackage.dto.InputApplicationPackage; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; -import com.easysoftware.domain.common.utils.HttpResult; import jakarta.annotation.Resource; @@ -20,47 +22,47 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService ApplicationPackageGateway appPkgGateway; @Override - public String insertAppPkg(InputApplicationPackage inputAppPkg) { + public ResponseEntity insertAppPkg(InputApplicationPackage inputAppPkg) { // 数据库中是否已存在该包 boolean found = appPkgGateway.existApp(inputAppPkg.getName()); if (found) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "请求的包已存在", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0008); } ApplicationPackage appPkg = new ApplicationPackage(); BeanUtils.copyProperties(inputAppPkg, appPkg); boolean succeed = appPkgGateway.save(appPkg); if (!succeed) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "新增数据失败", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); } - return HttpResult.ok("新增1条数据", null); + return ResultUtil.success(HttpStatus.OK); } @Override - public String searchAppPkg(ApplicationPackageSearchCondition condition) { + public ResponseEntity searchAppPkg(ApplicationPackageSearchCondition condition) { List res = appPkgGateway.queryByName(condition); - return HttpResult.ok("完成查询数据", res); + return ResultUtil.success(HttpStatus.OK, res); } @Override - public String updateAppPkg(InputApplicationPackage inputAppPkg) { + public ResponseEntity updateAppPkg(InputApplicationPackage inputAppPkg) { // 数据库中是否已存在该包 boolean found = appPkgGateway.existApp(inputAppPkg.getName()); if (!found) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "请求的包不存在", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0009); } ApplicationPackage appPkg = new ApplicationPackage(); BeanUtils.copyProperties(inputAppPkg, appPkg); boolean succeed = appPkgGateway.update(appPkg); if (!succeed) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "更新数据失败", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); } - return HttpResult.ok("更新1条数据", null); + return ResultUtil.success(HttpStatus.OK); } @Override - public String deleteAppPkg(List names) { + public ResponseEntity deleteAppPkg(List names) { List existedNames = new ArrayList<>(); for (String name : names) { boolean found = appPkgGateway.existApp(name); @@ -79,7 +81,7 @@ public class ApplicationPackageServiceImpl implements ApplicationPackageService String msg = String.format("请求删除的数据: %s, 在数据库中的数据: %s, 成功删除的数据: %s" , names.toString(), existedNames.toString(), deletedNames.toString()); - return HttpResult.ok(msg, null); + return ResultUtil.success(HttpStatus.OK); } } diff --git a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java index e09f8afbbd08e98358c04276a1a9ab0067e5b06e..cfe9b174d61c287d2301a84460eac305418c15b5 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java +++ b/src/main/java/com/easysoftware/application/applicationversion/ApplicationVersionServiceImpl.java @@ -9,10 +9,11 @@ import org.springframework.stereotype.Service; import com.easysoftware.application.applicationversion.dto.ApplicationVersionSearchCondition; import com.easysoftware.application.applicationversion.dto.InputApplicationVersion; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.applicationversion.ApplicationVersion; import com.easysoftware.domain.applicationversion.gateway.ApplicationVersionGateway; -import com.easysoftware.result.MessageCode; -import com.easysoftware.result.Result; +import com.easysoftware.domain.compatible.gateway.CompatibleGateway; import jakarta.annotation.Resource; @@ -21,27 +22,45 @@ public class ApplicationVersionServiceImpl implements ApplicationVersionService @Resource ApplicationVersionGateway AppVersionGateway; + @Resource + CompatibleGateway compatibleGateway; + + public String getCompatible(String name) { + return null; + } + @Override public ResponseEntity insertAppVersion(InputApplicationVersion inputAppVersion) { // 数据库中是否已存在该包 boolean found = AppVersionGateway.existApp(inputAppVersion.getName()); if (found) { - return Result.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0008); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0008); } ApplicationVersion AppVersion = new ApplicationVersion(); BeanUtils.copyProperties(inputAppVersion, AppVersion); boolean succeed = AppVersionGateway.save(AppVersion); if (!succeed) { - return Result.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); } - return Result.success(HttpStatus.OK); + // 同步更新兼容版本状态 + // InputCompatible inputCompatible = new InputCompatible(); + // inputCompatible.setName(inputAppVersion.getName()); + // inputCompatible.setUpstreamVersion(inputAppVersion.getVersion()); + // inputCompatible.setCompatibleVersion("compatibleVersion"); + // String status = "ok" ; + // inputCompatible.setStatus(status); + // Compatible Compatible = new Compatible(); + // BeanUtils.copyProperties(inputCompatible, Compatible); + // boolean succee = compatibleGateway.save(Compatible); + + return ResultUtil.success(HttpStatus.OK); } @Override public ResponseEntity searchAppVersion(ApplicationVersionSearchCondition condition) { List res = AppVersionGateway.queryByName(condition); - return Result.success(HttpStatus.OK, res); + return ResultUtil.success(HttpStatus.OK, res); } @Override @@ -49,16 +68,16 @@ public class ApplicationVersionServiceImpl implements ApplicationVersionService // 数据库中是否已存在该包 boolean found = AppVersionGateway.existApp(inputAppVersion.getName()); if (!found) { - return Result.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0009); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0009); } ApplicationVersion AppVersion = new ApplicationVersion(); BeanUtils.copyProperties(inputAppVersion, AppVersion); boolean succeed = AppVersionGateway.update(AppVersion); if (!succeed) { - return Result.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); } - return Result.success(HttpStatus.OK); + return ResultUtil.success(HttpStatus.OK); } @Override @@ -81,7 +100,7 @@ public class ApplicationVersionServiceImpl implements ApplicationVersionService String msg = String.format("请求删除的数据: %s, 在数据库中的数据: %s, 成功删除的数据: %s" , names.toString(), existedNames.toString(), deletedNames.toString()); - return Result.success(HttpStatus.OK, msg); + return ResultUtil.success(HttpStatus.OK, msg); } } diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java index 6a60536ba939329d446d205f5902001a6260274f..3845c36d5cbf56121690396aff327cb3294cf744 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java +++ b/src/main/java/com/easysoftware/application/applicationversion/dto/ApplicationVersionSearchCondition.java @@ -3,6 +3,7 @@ package com.easysoftware.application.applicationversion.dto; import org.hibernate.validator.constraints.Range; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,6 +15,7 @@ import lombok.NoArgsConstructor; public class ApplicationVersionSearchCondition { @Size(max = 50) @NotBlank + @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") private String name; @Range(min = 1, max = 1000, message = "page must be greater than 0 and less than 1000 ") diff --git a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java b/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java index 6ea6480537990f44ae991c811ef2d1dfdf6124aa..b078fde8ecbe95616afb9ec7b6819a8d63b2b5c9 100644 --- a/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java +++ b/src/main/java/com/easysoftware/application/applicationversion/dto/InputApplicationVersion.java @@ -1,5 +1,6 @@ package com.easysoftware.application.applicationversion.dto; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,16 +10,20 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class InputApplicationVersion { - @Size(max = 255, message = "the length of description can not exceed 255") + @Size(max = 255, message = "the length of version can not exceed 255") + @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") public String version; @NotBlank(message = "name can not be null") + @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") @Size(max = 255, message = "the length of name can not exceed 255") public String name; - @Size(max = 255, message = "the length of arch can not exceed 255") + @Size(max = 255, message = "the length of homepage can not exceed 255") + @Pattern(regexp = "^[A-Za-z0-9.()/\\-_ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") public String homepage; - @Size(max = 255, message = "the length of arch can not exceed 255") + @Size(max = 255, message = "the length of backend can not exceed 255") + @Pattern(regexp = "^[\\u4E00-\\u9FA5A-Za-z0-9.()$\\-_ ]+$", message = "Include only letters, digits, and special characters(_-()$.)") public String backend; } diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java index a32a49983c162599abe4481d51b8f02bb0221096..4e2a9c5af9a00fa61b2b9fdce60995af54ae9fae 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageService.java @@ -2,12 +2,14 @@ package com.easysoftware.application.rpmpackage; import java.util.List; +import org.springframework.http.ResponseEntity; + import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; public interface RPMPackageService { - String insertRPMPkg(InputRPMPackage inputrPMPackage); - String updateRPMPkg(InputRPMPackage inputrPMPackage); - String deleteRPMPkg(List names); - String searchRPMPkg(RPMPackageSearchCondition condition); + ResponseEntity insertRPMPkg(InputRPMPackage inputrPMPackage); + ResponseEntity updateRPMPkg(InputRPMPackage inputrPMPackage); + ResponseEntity deleteRPMPkg(List names); + ResponseEntity searchRPMPkg(RPMPackageSearchCondition condition); } diff --git a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java index 8bd69fbc2a3988ce94249ccae303e444d4354073..dc9f7eb95fa44fd6ef04ea293488d52638ec721b 100644 --- a/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java +++ b/src/main/java/com/easysoftware/application/rpmpackage/RPMPackageServiceImpl.java @@ -5,13 +5,15 @@ import java.util.List; import org.springframework.beans.BeanUtils; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import com.easysoftware.application.rpmpackage.dto.InputRPMPackage; import com.easysoftware.application.rpmpackage.dto.RPMPackageSearchCondition; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.utils.ResultUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; -import com.easysoftware.domain.common.utils.HttpResult; import com.easysoftware.domain.rpmpackage.RPMPackage; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; @@ -23,7 +25,7 @@ public class RPMPackageServiceImpl implements RPMPackageService { RPMPackageGateway rPMPkgGateway; @Override - public String deleteRPMPkg(List names) { + public ResponseEntity deleteRPMPkg(List names) { List existedNames = new ArrayList<>(); for (String name : names) { boolean found = rPMPkgGateway.existRPM(name); @@ -42,47 +44,47 @@ public class RPMPackageServiceImpl implements RPMPackageService { String msg = String.format("请求删除的数据: %s, 在数据库中的数据: %s, 成功删除的数据: %s" , names.toString(), existedNames.toString(), deletedNames.toString()); - return HttpResult.ok(msg, null); + return ResultUtil.success(HttpStatus.OK); } @Override - public String insertRPMPkg(InputRPMPackage inputrPMPackage) { + public ResponseEntity insertRPMPkg(InputRPMPackage inputrPMPackage) { // 数据库中是否已存在该包 boolean found = rPMPkgGateway.existRPM(inputrPMPackage.getName()); if (found) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "请求的包已存在", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0008); } RPMPackage rPMPkg = new RPMPackage(); BeanUtils.copyProperties(inputrPMPackage, rPMPkg); boolean succeed = rPMPkgGateway.save(rPMPkg); if (!succeed) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "新增数据失败", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0006); } - return HttpResult.ok("新增1条数据", null); + return ResultUtil.success(HttpStatus.OK); } @Override - public String searchRPMPkg(RPMPackageSearchCondition condition) { + public ResponseEntity searchRPMPkg(RPMPackageSearchCondition condition) { List res = rPMPkgGateway.queryByName(condition); - return HttpResult.ok("完成查询数据", res); + return ResultUtil.success(HttpStatus.OK, res); } @Override - public String updateRPMPkg(InputRPMPackage inputrPMPackage) { + public ResponseEntity updateRPMPkg(InputRPMPackage inputrPMPackage) { // 数据库中是否已存在该包 boolean found = rPMPkgGateway.existRPM(inputrPMPackage.getName()); if (!found) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "请求的包不存在", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0009); } RPMPackage rPMPkg = new RPMPackage(); BeanUtils.copyProperties(inputrPMPackage, rPMPkg); boolean succeed = rPMPkgGateway.update(rPMPkg); if (!succeed) { - return HttpResult.fail(HttpStatus.BAD_REQUEST.value(), "更新数据失败", null); + return ResultUtil.fail(HttpStatus.BAD_REQUEST, MessageCode.EC0004); } - return HttpResult.ok("更新1条数据", null); + return ResultUtil.success(HttpStatus.OK); } } diff --git a/src/main/java/com/easysoftware/result/MessageCode.java b/src/main/java/com/easysoftware/common/entity/MessageCode.java similarity index 97% rename from src/main/java/com/easysoftware/result/MessageCode.java rename to src/main/java/com/easysoftware/common/entity/MessageCode.java index c4d15c8f06e2c06d91508ed3cdf9b77c20df2f1f..4cf0d1804cfd68c2b701d646aedf3a4694b5eba1 100644 --- a/src/main/java/com/easysoftware/result/MessageCode.java +++ b/src/main/java/com/easysoftware/common/entity/MessageCode.java @@ -9,7 +9,7 @@ Create: 2024 */ -package com.easysoftware.result; +package com.easysoftware.common.entity; import java.util.Arrays; import java.util.Map; diff --git a/src/main/java/com/easysoftware/vo/ResultMsgVo.java b/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java similarity index 92% rename from src/main/java/com/easysoftware/vo/ResultMsgVo.java rename to src/main/java/com/easysoftware/common/entity/ResultMsgVo.java index b7ae5ea087841fbd0b8684ca938ddbd786ed9c7c..975c9ce2a8ee050798a31acf48ccb905864d3860 100644 --- a/src/main/java/com/easysoftware/vo/ResultMsgVo.java +++ b/src/main/java/com/easysoftware/common/entity/ResultMsgVo.java @@ -1,4 +1,4 @@ -package com.easysoftware.vo; +package com.easysoftware.common.entity; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/easysoftware/vo/ResultVo.java b/src/main/java/com/easysoftware/common/entity/ResultVo.java similarity index 90% rename from src/main/java/com/easysoftware/vo/ResultVo.java rename to src/main/java/com/easysoftware/common/entity/ResultVo.java index e7e736e9c17cd14fc632d2ef3216d453345ba6df..5578f91c70038173fb61d8e610c6dd8e14d7ae1d 100644 --- a/src/main/java/com/easysoftware/vo/ResultVo.java +++ b/src/main/java/com/easysoftware/common/entity/ResultVo.java @@ -1,4 +1,4 @@ -package com.easysoftware.vo; +package com.easysoftware.common.entity; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/src/main/java/com/easysoftware/domain/common/exception/MyJacksonException.java b/src/main/java/com/easysoftware/common/exception/MyJacksonException.java similarity index 84% rename from src/main/java/com/easysoftware/domain/common/exception/MyJacksonException.java rename to src/main/java/com/easysoftware/common/exception/MyJacksonException.java index 2326fa8487726aa3fedcdc14729911e8610f6ca6..7438ad202c4613cd0d6fed309066e6da88e6969c 100644 --- a/src/main/java/com/easysoftware/domain/common/exception/MyJacksonException.java +++ b/src/main/java/com/easysoftware/common/exception/MyJacksonException.java @@ -1,4 +1,4 @@ -package com.easysoftware.domain.common.exception; +package com.easysoftware.common.exception; public class MyJacksonException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/easysoftware/domain/common/exception/ParamErrorException.java b/src/main/java/com/easysoftware/common/exception/ParamErrorException.java similarity index 82% rename from src/main/java/com/easysoftware/domain/common/exception/ParamErrorException.java rename to src/main/java/com/easysoftware/common/exception/ParamErrorException.java index 6700d441b68b6e4fa6203f70abbad0d57e59b178..656ede107dce13b0be7f8e22cb45c0bba234f0da 100644 --- a/src/main/java/com/easysoftware/domain/common/exception/ParamErrorException.java +++ b/src/main/java/com/easysoftware/common/exception/ParamErrorException.java @@ -1,4 +1,4 @@ -package com.easysoftware.domain.common.exception; +package com.easysoftware.common.exception; public class ParamErrorException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/easysoftware/utils/ClientUtil.java b/src/main/java/com/easysoftware/common/utils/ClientUtil.java similarity index 98% rename from src/main/java/com/easysoftware/utils/ClientUtil.java rename to src/main/java/com/easysoftware/common/utils/ClientUtil.java index aaa33fe46c5830d2b7fc794d2a94d148632859f4..207683d6b304c63c35d7be2d62b262ea0041e4c0 100644 --- a/src/main/java/com/easysoftware/utils/ClientUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ClientUtil.java @@ -1,4 +1,4 @@ -package com.easysoftware.utils; +package com.easysoftware.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/easysoftware/utils/LogUtil.java b/src/main/java/com/easysoftware/common/utils/LogUtil.java similarity index 93% rename from src/main/java/com/easysoftware/utils/LogUtil.java rename to src/main/java/com/easysoftware/common/utils/LogUtil.java index 48e14b0a3f66a32c84d7cecd4cdc6ff07b9c7520..0b7599eede7419df35f7df1cbfe6a5bc5ee182f1 100644 --- a/src/main/java/com/easysoftware/utils/LogUtil.java +++ b/src/main/java/com/easysoftware/common/utils/LogUtil.java @@ -1,7 +1,7 @@ -package com.easysoftware.utils; +package com.easysoftware.common.utils; -import com.easysoftware.vo.ManagementLog; -import com.easysoftware.vo.ResultVo; +import com.easysoftware.aop.ManagementLog; +import com.easysoftware.common.entity.ResultVo; import com.fasterxml.jackson.databind.ObjectMapper; import org.aspectj.lang.JoinPoint; diff --git a/src/main/java/com/easysoftware/domain/common/utils/ObjectMapperUtil.java b/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java similarity index 98% rename from src/main/java/com/easysoftware/domain/common/utils/ObjectMapperUtil.java rename to src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java index 605df6569b821ae21ef91a0e2a3bf7f46eccca15..448817a24245c096b9737afe050c17896584ee6c 100644 --- a/src/main/java/com/easysoftware/domain/common/utils/ObjectMapperUtil.java +++ b/src/main/java/com/easysoftware/common/utils/ObjectMapperUtil.java @@ -1,6 +1,6 @@ -package com.easysoftware.domain.common.utils; +package com.easysoftware.common.utils; -import com.easysoftware.domain.common.exception.MyJacksonException; +import com.easysoftware.common.exception.MyJacksonException; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/com/easysoftware/result/Result.java b/src/main/java/com/easysoftware/common/utils/ResultUtil.java similarity index 95% rename from src/main/java/com/easysoftware/result/Result.java rename to src/main/java/com/easysoftware/common/utils/ResultUtil.java index da02e6794263b0be60234308be5a559ab4f3ec42..e228f83c44898a45bd8c415d4086edb9098ce825 100644 --- a/src/main/java/com/easysoftware/result/Result.java +++ b/src/main/java/com/easysoftware/common/utils/ResultUtil.java @@ -9,18 +9,18 @@ Create: 2024 */ -package com.easysoftware.result; +package com.easysoftware.common.utils; import java.util.HashMap; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import com.easysoftware.vo.ResultMsgVo; -import com.easysoftware.vo.ResultVo; +import com.easysoftware.common.entity.MessageCode; +import com.easysoftware.common.entity.ResultMsgVo; +import com.easysoftware.common.entity.ResultVo; - -public class Result { +public class ResultUtil { public static ResponseEntity success(HttpStatus status) { ResultVo res = new ResultVo() .setCode(status.value()) diff --git a/src/main/java/com/easysoftware/domain/common/utils/UuidUtil.java b/src/main/java/com/easysoftware/common/utils/UuidUtil.java similarity index 79% rename from src/main/java/com/easysoftware/domain/common/utils/UuidUtil.java rename to src/main/java/com/easysoftware/common/utils/UuidUtil.java index d3380edb221ce2594fdaf6f5c9dd78cc51193454..ec6b29686c585a708e338f432d440e1bb6009770 100644 --- a/src/main/java/com/easysoftware/domain/common/utils/UuidUtil.java +++ b/src/main/java/com/easysoftware/common/utils/UuidUtil.java @@ -1,4 +1,4 @@ -package com.easysoftware.domain.common.utils; +package com.easysoftware.common.utils; import java.util.UUID; diff --git a/src/main/java/com/easysoftware/domain/common/utils/HttpResult.java b/src/main/java/com/easysoftware/domain/common/utils/HttpResult.java deleted file mode 100644 index 88a3960739417bb7e0e22aa5f4085b3bb1a0561d..0000000000000000000000000000000000000000 --- a/src/main/java/com/easysoftware/domain/common/utils/HttpResult.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.easysoftware.domain.common.utils; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.springframework.http.HttpStatus; - -import lombok.Data; - -@Data -public class HttpResult { - private Integer status; - private String msg; - private Object object; - private String updataAt; - - public HttpResult(Throwable e) { - this.status = HttpStatus.BAD_REQUEST.value(); - this.msg = e.getMessage(); - } - - public HttpResult() { - } - - public HttpResult(Integer status, String msg, Object object, String updataAt) { - this.status = status; - this.msg = msg; - this.object = object; - this.updataAt = updataAt; - } - - public static String ok(String msg, Object object) { - String updataAt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").format(new Date()); - HttpResult res = new HttpResult(HttpStatus.OK.value(), msg, object, updataAt); - return ObjectMapperUtil.writeValueAsString(res); - } - - public static String fail(Integer status, String msg, Object object) { - String updataAt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX").format(new Date()); - HttpResult res = new HttpResult(status, msg, object, updataAt); - return ObjectMapperUtil.writeValueAsString(res); - } - -} diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConvertor.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConvertor.java index 7b9edadcc4735b56f73d3f7f63e9ca15a4b45d92..15b2f7acbcb1bbbea14b29e1574cf1752faf2993 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConvertor.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/converter/ApplicationPackageConvertor.java @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.BeanUtils; +import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; -import com.easysoftware.domain.common.utils.UuidUtil; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject.ApplicationPackageDO; public class ApplicationPackageConvertor { diff --git a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java index 1d66a6706c07a59814860287089ed803c8ebb6af..b1a98a2773560b03415eee1d6dab74c4b6898e32 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationversion/gatewayimpl/converter/ApplicationVersionConvertor.java @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.BeanUtils; +import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.applicationversion.ApplicationVersion; -import com.easysoftware.domain.common.utils.UuidUtil; import com.easysoftware.infrastructure.applicationversion.gatewayimpl.dataobject.ApplicationVersionDO; public class ApplicationVersionConvertor { diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java index 6e1db159a04547f7c0f02b05ac813c44574c9954..1c2f15d7e2679639e2437a9dfd8fe41befdcb872 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/converter/RPMPackageConverter.java @@ -6,8 +6,8 @@ import java.util.List; import org.springframework.beans.BeanUtils; +import com.easysoftware.common.utils.UuidUtil; import com.easysoftware.domain.applicationpackage.ApplicationPackage; -import com.easysoftware.domain.common.utils.UuidUtil; import com.easysoftware.domain.rpmpackage.RPMPackage; import com.easysoftware.infrastructure.applicationpackage.gatewayimpl.dataobject.ApplicationPackageDO; import com.easysoftware.infrastructure.rpmpackage.gatewayimpl.dataobject.RPMPackageDO;