fix(主体授权bug修改): 主体授权bug修改

1.主体授权-auth-service-用户管理返回前端缺失id
2.主体授权-app-service-服务列表填充应用名称报错
3.主体授权-auth-back-前端请求路径修改

src/main/java/com/dragoninfo/dcuc/authweb/exception/RespExceptionHandler.java

@@ -1,13 +1,17 @@
 package com.dragoninfo.dcuc.authweb.exception;
 
 
-import com.dragoninfo.dcuc.common.enums.ErrorCode;
-import com.dragoninfo.dcuc.common.enums.HttpCode;
+import com.dragoninfo.dcuc.common.enums.ErrorCodeEnum;
+import com.dragoninfo.dcuc.common.exception.GmConfidentialityException;
+import com.dragoninfo.dcuc.common.exception.GmIntegrityException;
+import com.dragoninfo.dcuc.common.exception.GmNonRepudiationException;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
+import feign.FeignException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindException;
 import org.springframework.validation.FieldError;
@@ -45,16 +49,27 @@ public class RespExceptionHandler implements HandlerExceptionResolver {
             PrintWriter writer = response.getWriter();
             ResponseStatus fail = null;
             if (ex instanceof ConstraintViolationException) {
-                response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
-                fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), ex.getMessage()));
+                response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+                fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), ex.getMessage()));
             } else if (ex instanceof MethodArgumentNotValidException) {
-                response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
+                response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
                 String msg = getValidMessage((MethodArgumentNotValidException) ex);
-                fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), msg));
+                fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), msg));
             } else if (ex instanceof BindException) {
-                response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
+                response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
                 String message = Objects.requireNonNull(((BindException) ex).getFieldError()).getDefaultMessage();
-                fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), message));
+                fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), message));
+            } else if (ex instanceof FeignException) {
+                String message = ex.getMessage();
+                if (message.contains(GmConfidentialityException.ERROR_MESSAGE)) {
+                    fail = ResponseStatus.fail(String.valueOf(HttpStatus.NOT_ACCEPTABLE.value()), GmConfidentialityException.ERROR_MESSAGE);
+                } else if (message.contains(GmIntegrityException.ERROR_MESSAGE)) {
+                    fail = ResponseStatus.fail(String.valueOf(HttpStatus.NOT_ACCEPTABLE.value()), GmIntegrityException.ERROR_MESSAGE);
+                } else if (message.contains(GmNonRepudiationException.ERROR_MESSAGE)) {
+                    fail = ResponseStatus.fail(String.valueOf(HttpStatus.NOT_ACCEPTABLE.value()), GmNonRepudiationException.ERROR_MESSAGE);
+                } else {
+                    fail = ResponseStatus.fail("500", "未知异常[" + ex.getMessage() + "]");
+                }
             } else {
                 fail = ResponseStatus.fail("500", "未知异常[" + ex.getMessage() + "]");
             }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -149,7 +149,7 @@ public class AppFunInfoController {
 
     @ApiOperation(value = "功能资源新增")
     @ApiImplicitParam(name = "功能资源新增", value = "功能资源新增")
-    @PostMapping(value = "/")
+    @PostMapping(value = "/save")
     public Result saveAppFunInfo(@Validated @RequestBody  AppFunInfoVo appFunInfoVo) {
         AppFunInfo appFunInfo = new AppFunInfo();
         BeanUtils.copyProperties(appFunInfoVo, appFunInfo);
@@ -162,7 +162,7 @@ public class AppFunInfoController {
 
     @ApiOperation(value = "功能资源修改")
     @ApiImplicitParam(name = "功能资源修改", value = "功能资源修改")
-    @PutMapping(value = "/")
+    @PutMapping(value = "/update")
     public Result updateAppFunInfo(@Validated @RequestBody  AppFunInfoVo appFunInfoVo) {
         ResponseStatus responseStatus = iAppFunInfoFacade.updateAppFunInfo(appFunInfoVo);
         if (!responseStatus.getStatusCode().equals("200")){

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/ServiceResourceController.java

@@ -83,7 +83,7 @@ public class ServiceResourceController {
 
     @ApiOperation(value = "服务资源新增")
     @ApiImplicitParam(name = "服务资源新增", value = "服务资源新增")
-    @PostMapping(value = "/")
+    @PostMapping(value = "/save")
     public Result save(@Validated @RequestBody ServiceResourceDTO serviceResourceDTO) {
         ResponseStatus responseStatus = serviceResourceFacade.save(serviceResourceDTO);
         if (!responseStatus.getStatusCode().equals("200")){
@@ -102,7 +102,7 @@ public class ServiceResourceController {
 
     @ApiOperation(value = "服务资源修改")
     @ApiImplicitParam(name = "服务资源修改", value = "服务资源修改")
-    @PutMapping(value = "")
+    @PutMapping(value = "update")
     public Result update(@RequestBody ServiceResourceVo serviceResourceVo) {
         serviceResourceFacade.updateServiceResource(serviceResourceVo);
         return Result.success();