Merge https://gitee.com/wuxw7/MicroCommunity

java110

2021-05-15 811e8e7139ad6e331c2f84bcd5cf3f927a8b3312

 service-front/src/main/java/com/java110/front/controller/CallComponentController.java

@@ -125,8 +125,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }

    /**
@@ -195,8 +195,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }

    //组件上传文件处理/callComponent/upload/
@@ -266,8 +266,8 @@
            if (!StringUtil.isEmpty(version) && VERSION_2.equals(version)) {
                return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, responseEntity.getBody());
            }
            return responseEntity;
        }
        return responseEntity;
    }

    /**
@@ -320,8 +320,8 @@
            responseEntity = new ResponseEntity<Object>(msg, HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            logger.debug("组件调用返回信息为{}", responseEntity);
            return responseEntity;
        }
        return responseEntity;
    }

    /**