diff --git a/maven-cloudwalk-cloud/cloudwalk-cloud-common/pom.xml b/maven-cloudwalk-cloud/cloudwalk-cloud-common/pom.xml index bde66247..32a96ca9 100644 --- a/maven-cloudwalk-cloud/cloudwalk-cloud-common/pom.xml +++ b/maven-cloudwalk-cloud/cloudwalk-cloud-common/pom.xml @@ -15,5 +15,5 @@ 4.0.0-Brussels-SRX pom cloudwalk-cloud-common (stub parent) - 与历史/私服已发布 JAR 中声明的 parent 对齐；聚合父工程见 cloudwalk-cloud-reactor。 + 本模块为 packaging=pom 的父坐标桩，刻意不含 src/main/java：上游 cloudwalk-cloud-common 即为 BOM 式父 POM，cw_lib 亦无对应 JAR。与 maven-cloudwalk-legacy-public 下 3.7.2 的 cloudwalk-cloud-common 为不同版本，勿混用。详见 docs/architecture/Maven聚合工程说明.md。 diff --git a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java index fe7c5353..c109c28b 100644 --- a/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java +++ b/maven-cloudwalk-cloud/cloudwalk-common-event/src/main/java/cn/cloudwalk/event/listener/GroupEventListener.java @@ -5,17 +5,24 @@ import cn.cloudwalk.cwos.client.event.handler.EventListener; import cn.cloudwalk.event.CloudwalkEventManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; public abstract class GroupEventListener implements EventListener { public static ApplicationContext applicationContext; - private static final Logger LOGGER = LoggerFactory.getLogger(CloudwalkEventListener.class); + private static final Logger LOGGER = LoggerFactory.getLogger(GroupEventListener.class); public void messageListener(BaseEvent baseEvent) throws RuntimeException { try { CloudwalkEventManager cloudwalkEventManager = (CloudwalkEventManager)applicationContext.getBean(CloudwalkEventManager.class); cloudwalkEventManager.handle(getClass(), baseEvent); + } catch (BeansException e) { + LOGGER.error("事件处理出现异常（容器 Bean 解析失败），原因：", e); + throw new RuntimeException(e); + } catch (RuntimeException e) { + LOGGER.error("事件处理出现异常，原因：", e); + throw e; } catch (Exception e) { LOGGER.error("事件处理出现异常，原因：", e); throw new RuntimeException(e); diff --git a/maven-cloudwalk-cloud/cloudwalk-common-service/src/main/java/cn/cloudwalk/service/aop/CloudwalkParamsValidateAspect.java b/maven-cloudwalk-cloud/cloudwalk-common-service/src/main/java/cn/cloudwalk/service/aop/CloudwalkParamsValidateAspect.java index 0aea373c..ec073396 100644 --- a/maven-cloudwalk-cloud/cloudwalk-common-service/src/main/java/cn/cloudwalk/service/aop/CloudwalkParamsValidateAspect.java +++ b/maven-cloudwalk-cloud/cloudwalk-common-service/src/main/java/cn/cloudwalk/service/aop/CloudwalkParamsValidateAspect.java @@ -39,9 +39,9 @@ public class CloudwalkParamsValidateAspect { } @Pointcut("@annotation(cn.cloudwalk.cloud.annotation.CloudwalkParamsValidate)") - public void validatePointcat() {} + public void validatePointcut() {} - @Around("validatePointcat()") + @Around("validatePointcut()") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { MethodSignature methodSignature = (MethodSignature)joinPoint.getSignature(); Method targetMethod = diff --git a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java index 90e85e3f..888b556d 100644 --- a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java +++ b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/common/AbstractCloudwalkController.java @@ -49,7 +49,11 @@ public abstract class AbstractCloudwalkController { } protected HttpServletRequest getHttpServletRequest() { - return ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + return null; + } + return attributes.getRequest(); } public String getMessage(String code, String defaultMsg) { diff --git a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/AcsElevatorDeviceGetWayController.java b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/AcsElevatorDeviceGetWayController.java index e2fa7788..eff2fbe9 100644 --- a/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/AcsElevatorDeviceGetWayController.java +++ b/maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/AcsElevatorDeviceGetWayController.java @@ -215,12 +215,17 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll } } + /** + * 历史接口：曾下发应用密钥。按安全走查要求不再返回明文密钥，仅保留时间戳供客户端对时等场景使用。 + */ + @Deprecated @PostMapping({"39204"}) public CloudwalkResult getKey(@RequestBody AcsElevatorRecordAddForm form) { KeyValueResult result = new KeyValueResult(); - result.setKey(this.key); + result.setKey(""); result.setTime(this.time); - result.setKeyA(this.keyA); + result.setKeyA(""); + this.LOGGER.warn("getKey(39204) 已停用明文密钥下发，调用方应迁移至安全鉴权方式"); return CloudwalkResult.success(result); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/AccountLoginFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/AccountLoginFeignClient.java index 713a2ab1..940bfa1c 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/AccountLoginFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/AccountLoginFeignClient.java @@ -4,7 +4,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.account.param.AccountLoginP import cn.cloudwalk.client.cwoscomponent.intelligent.account.result.AccountLoginResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.account.feign.fallback.AccountLoginFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/fallback/AccountLoginFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/fallback/AccountLoginFeignClientFallback.java index 5e3e61aa..ba1971bb 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/fallback/AccountLoginFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/account/feign/fallback/AccountLoginFeignClientFallback.java @@ -7,6 +7,6 @@ import cn.cloudwalk.rest.cwoscomponent.intelligent.account.feign.AccountLoginFei public class AccountLoginFeignClientFallback implements AccountLoginFeignClient { public CloudwalkResult login(AccountLoginParam param) { - throw new RuntimeException("账户登录失败"); + return CloudwalkResult.fail("76260800", "账户登录失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/FaceFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/FaceFeignClient.java index 137bbdf9..8af2a823 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/FaceFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/FaceFeignClient.java @@ -4,7 +4,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.face.param.FaceAddPar import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.face.param.FaceRemoveParam; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.ai.v2.face.feign.fallback.FaceFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/fallback/FaceFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/fallback/FaceFeignClientFallback.java index 81a02f25..f7118a02 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/fallback/FaceFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/face/feign/fallback/FaceFeignClientFallback.java @@ -9,10 +9,10 @@ import org.springframework.stereotype.Component; @Component public class FaceFeignClientFallback implements FaceFeignClient { public CloudwalkResult add(FaceAddParam param) { - throw new RuntimeException("新增人脸特征失败"); + return CloudwalkResult.fail("76260800", "新增人脸特征失败"); } public CloudwalkResult remove(FaceRemoveParam param) { - throw new RuntimeException("删除人脸特征失败"); + return CloudwalkResult.fail("76260800", "删除人脸特征失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/FeatureFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/FeatureFeignClient.java index 61f29598..5c87aada 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/FeatureFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/FeatureFeignClient.java @@ -4,7 +4,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.feature.param.Feature import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.feature.result.FeatureExtractResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.ai.v2.feature.feign.fallback.FeatureFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/fallback/FeatureFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/fallback/FeatureFeignClientFallback.java index 08530b12..10bd1ed3 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/fallback/FeatureFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/feature/feign/fallback/FeatureFeignClientFallback.java @@ -9,6 +9,6 @@ import org.springframework.stereotype.Component; @Component public class FeatureFeignClientFallback implements FeatureFeignClient { public CloudwalkResult extract(FeatureExtractParam param) { - throw new RuntimeException("提取特征失败"); + return CloudwalkResult.fail("76260800", "提取特征失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/GroupFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/GroupFeignClient.java index d64bff68..a1ead9d5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/GroupFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/GroupFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.group.param.GroupGetP import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.group.result.GroupResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.ai.v2.group.feign.fallback.GroupFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/fallback/GroupFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/fallback/GroupFeignClientFallback.java index 7dc9bd08..f9b7094c 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/fallback/GroupFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/group/feign/fallback/GroupFeignClientFallback.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Component; @Component public class GroupFeignClientFallback implements GroupFeignClient { public CloudwalkResult add(GroupAddParam param) { - throw new RuntimeException("新增图库失败"); + return CloudwalkResult.fail("76260800", "新增图库失败"); } public CloudwalkResult get(GroupGetParam param) { - throw new RuntimeException("图库查询失败"); + return CloudwalkResult.fail("76260800", "图库查询失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/SearchFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/SearchFeignClient.java index 8285b8db..b8aa76a5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/SearchFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/SearchFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.ai.v2.staticdb.result.Searc import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.ai.v2.staticdb.feign.fallback.SearchFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/fallback/SearchFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/fallback/SearchFeignClientFallback.java index 27c2594a..a645e88f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/fallback/SearchFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/ai/v2/staticdb/feign/fallback/SearchFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class SearchFeignClientFallback implements SearchFeignClient { public CloudwalkResult> multiple(SearchMultipleParam param) { - throw new RuntimeException("1:N比对失败"); + return CloudwalkResult.fail("76260800", "1:N比对失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationFeignClient.java index ac3f8d3e..7a5026b4 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.application.result.SceneApp import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.application.feign.fallback.ApplicationFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationImageStoreFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationImageStoreFeignClient.java index 91128533..6b58d5f5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationImageStoreFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/ApplicationImageStoreFeignClient.java @@ -7,7 +7,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.application.result.Applicat import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.application.feign.fallback.ApplicationImageStoreFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationFeignClientFallback.java index 12e4afcb..a4832d60 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class ApplicationFeignClientFallback implements ApplicationFeignClient { public CloudwalkResult> getSceneApps(SceneAppsGetParam param) { - throw new RuntimeException("查询租户下所有的场景应用失败"); + return CloudwalkResult.fail("76260800", "查询租户下所有的场景应用失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationImageStoreFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationImageStoreFeignClientFallback.java index 8eed9eaf..b518df83 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationImageStoreFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/application/feign/fallback/ApplicationImageStoreFeignClientFallback.java @@ -12,14 +12,14 @@ import org.springframework.stereotype.Component; @Component public class ApplicationImageStoreFeignClientFallback implements ApplicationImageStoreFeignClient { public CloudwalkResult> list(ApplicationImageStoreQueryParam param) { - throw new RuntimeException("查询应用图库关联失败"); + return CloudwalkResult.fail("76260800", "查询应用图库关联失败"); } public CloudwalkResult add(ApplicationImageStoreAddParam param) { - throw new RuntimeException("添加应用图库关联失败"); + return CloudwalkResult.fail("76260800", "添加应用图库关联失败"); } public CloudwalkResult delete(ApplicationImageStoreDelParam param) { - throw new RuntimeException("删除应用图库关联失败"); + return CloudwalkResult.fail("76260800", "删除应用图库关联失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/BiologyToolFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/BiologyToolFeignClient.java index 1f2e6e04..90684832 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/BiologyToolFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/BiologyToolFeignClient.java @@ -8,7 +8,7 @@ import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.biology.feign.fallback.BiologyToolFeignClientFallback; import java.util.List; import java.util.Map; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/fallback/BiologyToolFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/fallback/BiologyToolFeignClientFallback.java index 61ba3588..9a64775e 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/fallback/BiologyToolFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/biology/feign/fallback/BiologyToolFeignClientFallback.java @@ -13,14 +13,14 @@ import org.springframework.stereotype.Component; @Component public class BiologyToolFeignClientFallback implements BiologyToolFeignClient { public CloudwalkResult extract(FeatureExtractParam param) { - throw new RuntimeException("特征提取失败"); + return CloudwalkResult.fail("76260800", "特征提取失败"); } public CloudwalkResult> query(FeatureQueryParam param) { - throw new RuntimeException("图库识别，返回所有图库topN失败"); + return CloudwalkResult.fail("76260800", "图库识别，返回所有图库topN失败"); } public CloudwalkResult>> querygroups(FeatureQueryParam param) { - throw new RuntimeException("图库识别，返回每个图库topN失败"); + return CloudwalkResult.fail("76260800", "图库识别，返回每个图库topN失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceApplicationFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceApplicationFeignClient.java index da6c2756..84b0b48a 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceApplicationFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceApplicationFeignClient.java @@ -6,7 +6,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceApplica import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceApplicationFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceAreaFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceAreaFeignClient.java index a582db3b..a6e2de4f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceAreaFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceAreaFeignClient.java @@ -6,7 +6,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceAreaRes import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceAreaFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceDistrictFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceDistrictFeignClient.java index 27f0f2aa..2eaf4955 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceDistrictFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceDistrictFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceDistric import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceDistrictFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceFeignClient.java index a67d31b1..79aa8913 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceFeignClient.java @@ -8,7 +8,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceImageStoreFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceImageStoreFeignClient.java index 7dd7b323..3d584135 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceImageStoreFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceImageStoreFeignClient.java @@ -8,7 +8,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceImageStoreFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceKitFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceKitFeignClient.java index ac59cf8b..d86bc3a7 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceKitFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceKitFeignClient.java @@ -4,7 +4,7 @@ import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.device.sdk.protocol.entity.v2proto.http.param.UpdatePersonParam; import cn.cloudwalk.device.sdk.protocol.entity.v2proto.http.result.UpdatePersonResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceKitFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceNotifyFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceNotifyFeignClient.java index bdcf4bc9..fee90165 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceNotifyFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceNotifyFeignClient.java @@ -6,7 +6,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceSetting import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.EntranceGuardControlResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceNotifyFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceSettingFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceSettingFeignClient.java index 8d9db935..29a5085a 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceSettingFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceSettingFeignClient.java @@ -7,7 +7,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceSetting import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceSettingFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceTypeFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceTypeFeignClient.java index 8014e5e9..a702e01c 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceTypeFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/DeviceTypeFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceTypeRes import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.device.feign.fallback.DeviceTypeFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceApplicationFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceApplicationFeignClientFallback.java index 35b118a1..cc52e44f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceApplicationFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceApplicationFeignClientFallback.java @@ -11,14 +11,14 @@ import org.springframework.stereotype.Component; @Component public class DeviceApplicationFeignClientFallback implements DeviceApplicationFeignClient { public CloudwalkResult add(DeviceApplicationParam param) { - throw new RuntimeException("添加设备应用关联关系失败"); + return CloudwalkResult.fail("76260800", "添加设备应用关联关系失败"); } public CloudwalkResult delete(DeviceApplicationParam param) { - throw new RuntimeException("删除设备应用关联关系失败"); + return CloudwalkResult.fail("76260800", "删除设备应用关联关系失败"); } public CloudwalkResult> list(DeviceApplicationQueryParam param) { - throw new RuntimeException("设备应用关联信息列表查询失败"); + return CloudwalkResult.fail("76260800", "设备应用关联信息列表查询失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceAreaFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceAreaFeignClientFallback.java index 410af6a0..3baa79c9 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceAreaFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceAreaFeignClientFallback.java @@ -11,10 +11,10 @@ import org.springframework.stereotype.Component; @Component public class DeviceAreaFeignClientFallback implements DeviceAreaFeignClient { public CloudwalkResult> list(DeviceAreaQueryParam param) { - throw new RuntimeException("查询区域信息列表失败"); + return CloudwalkResult.fail("76260800", "查询区域信息列表失败"); } public CloudwalkResult delete(DeviceAreaDeleteParam param) { - throw new RuntimeException("删除区域失败"); + return CloudwalkResult.fail("76260800", "删除区域失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceDistrictFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceDistrictFeignClientFallback.java index 181f1132..4a3330c9 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceDistrictFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceDistrictFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class DeviceDistrictFeignClientFallback implements DeviceDistrictFeignClient { public CloudwalkResult> list(DeviceDistrictQueryParam param) { - throw new RuntimeException("查询省市区列表信息失败"); + return CloudwalkResult.fail("76260800", "查询省市区列表信息失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceFeignClientFallback.java index 194dfb1c..16f9c9b6 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceFeignClientFallback.java @@ -13,18 +13,18 @@ import org.springframework.stereotype.Component; @Component public class DeviceFeignClientFallback implements DeviceFeignClient { public CloudwalkResult> list(DeviceQueryParam param) { - throw new RuntimeException("查询设备信息列表失败"); + return CloudwalkResult.fail("76260800", "查询设备信息列表失败"); } public CloudwalkResult> page(DeviceQueryParam param) { - throw new RuntimeException("分页查询设备信息列表失败"); + return CloudwalkResult.fail("76260800", "分页查询设备信息列表失败"); } public CloudwalkResult statusCount(String businessId) { - throw new RuntimeException("设备状态统计失败"); + return CloudwalkResult.fail("76260800", "设备状态统计失败"); } public CloudwalkResult delete(DeviceDeleteParam param) { - throw new RuntimeException("删除设备信息失败"); + return CloudwalkResult.fail("76260800", "删除设备信息失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceImageStoreFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceImageStoreFeignClientFallback.java index 859aa6b8..ab0cb1a5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceImageStoreFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceImageStoreFeignClientFallback.java @@ -13,22 +13,22 @@ import org.springframework.stereotype.Component; @Component public class DeviceImageStoreFeignClientFallback implements DeviceImageStoreFeignClient { public CloudwalkResult add(DeviceImageStoreParam param) { - throw new RuntimeException("添加设备图库关联失败"); + return CloudwalkResult.fail("76260800", "添加设备图库关联失败"); } public CloudwalkResult delete(DeviceImageStoreParam param) { - throw new RuntimeException("删除设备图库关联失败"); + return CloudwalkResult.fail("76260800", "删除设备图库关联失败"); } public CloudwalkResult save(DeviceImageStoreSaveParam param) { - throw new RuntimeException("保存设备图库关联失败"); + return CloudwalkResult.fail("76260800", "保存设备图库关联失败"); } public CloudwalkResult> list(DeviceImageStoreQueryParam param) { - throw new RuntimeException("查询设备图库关联失败"); + return CloudwalkResult.fail("76260800", "查询设备图库关联失败"); } public CloudwalkResult> page(DeviceImageStoreQueryParam param) { - throw new RuntimeException("分页查询设备图库关联失败"); + return CloudwalkResult.fail("76260800", "分页查询设备图库关联失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceKitFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceKitFeignClientFallback.java index 8a7fbd95..bb8baac5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceKitFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceKitFeignClientFallback.java @@ -9,6 +9,6 @@ import org.springframework.stereotype.Component; @Component public class DeviceKitFeignClientFallback implements DeviceKitFeignClient { public CloudwalkResult updatePerson(UpdatePersonParam param) { - throw new RuntimeException("请求更新人员信息失败"); + return CloudwalkResult.fail("76260800", "请求更新人员信息失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceNotifyFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceNotifyFeignClientFallback.java index dc6419e2..3201861f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceNotifyFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceNotifyFeignClientFallback.java @@ -11,10 +11,10 @@ import org.springframework.stereotype.Component; @Component public class DeviceNotifyFeignClientFallback implements DeviceNotifyFeignClient { public CloudwalkResult notifySetting(DeviceSettingNotifyParam param) { - throw new RuntimeException("下发终端设置参数失败"); + return CloudwalkResult.fail("76260800", "下发终端设置参数失败"); } public CloudwalkResult entranceGuardControl(EntranceGuardControlParam param) { - throw new RuntimeException("下发开关门控制失败"); + return CloudwalkResult.fail("76260800", "下发开关门控制失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceSettingFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceSettingFeignClientFallback.java index e9116beb..b7c2fe7f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceSettingFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceSettingFeignClientFallback.java @@ -12,10 +12,10 @@ import org.springframework.stereotype.Component; @Component public class DeviceSettingFeignClientFallback implements DeviceSettingFeignClient { public CloudwalkResult> query(DeviceSettingQueryParam param) { - throw new RuntimeException("查询设备配置列表失败"); + return CloudwalkResult.fail("76260800", "查询设备配置列表失败"); } public CloudwalkResult> init(DeviceSettingInitParam param) { - throw new RuntimeException("查询设备第一次上传数据内容失败"); + return CloudwalkResult.fail("76260800", "查询设备第一次上传数据内容失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceTypeFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceTypeFeignClientFallback.java index 40d25795..73bdc832 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceTypeFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/device/feign/fallback/DeviceTypeFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class DeviceTypeFeignClientFallback implements DeviceTypeFeignClient { public CloudwalkResult> get(DeviceTypeQueryParam param) { - throw new RuntimeException("查询设备类型信息返回树型数据结构失败"); + return CloudwalkResult.fail("76260800", "查询设备类型信息返回树型数据结构失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/ElevatorPersonFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/ElevatorPersonFeignClient.java index 47260f15..5d7d7319 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/ElevatorPersonFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/ElevatorPersonFeignClient.java @@ -3,7 +3,7 @@ package cn.cloudwalk.rest.cwoscomponent.intelligent.elevator.feign; import cn.cloudwalk.client.cwoscomponent.intelligent.elevator.param.AcsPersonAddVisitorParam; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.elevator.feign.fallback.ElevatorPersonFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/fallback/ElevatorPersonFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/fallback/ElevatorPersonFeignClientFallback.java index 309b11d2..7d0d1783 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/fallback/ElevatorPersonFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/elevator/feign/fallback/ElevatorPersonFeignClientFallback.java @@ -8,6 +8,6 @@ import org.springframework.stereotype.Component; @Component public class ElevatorPersonFeignClientFallback implements ElevatorPersonFeignClient { public CloudwalkResult addVisitor(AcsPersonAddVisitorParam param) { - throw new RuntimeException("根据被访人添加访客派梯权限失败"); + return CloudwalkResult.fail("76260800", "根据被访人添加访客派梯权限失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/EmailSendFeign.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/EmailSendFeign.java index ed942469..38eeabe5 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/EmailSendFeign.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/EmailSendFeign.java @@ -3,7 +3,7 @@ package cn.cloudwalk.rest.cwoscomponent.intelligent.email.feign; import cn.cloudwalk.client.cwoscomponent.intelligent.email.param.EmailSendParam; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.email.feign.fallback.EmailSendFeignFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/fallback/EmailSendFeignFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/fallback/EmailSendFeignFallback.java index c55622c4..403610a3 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/fallback/EmailSendFeignFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/email/feign/fallback/EmailSendFeignFallback.java @@ -8,6 +8,6 @@ import org.springframework.stereotype.Component; @Component public class EmailSendFeignFallback implements EmailSendFeign { public CloudwalkResult send(EmailSendParam param) { - throw new RuntimeException("邮件发送失败"); + return CloudwalkResult.fail("76260800", "邮件发送失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/FileFeign.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/FileFeign.java index b28cb046..f9755485 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/FileFeign.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/FileFeign.java @@ -6,7 +6,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.file.param.FileInitParam; import cn.cloudwalk.client.cwoscomponent.intelligent.file.result.FileDetail; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.file.feign.fallback.FileFeignFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/fallback/FileFeignFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/fallback/FileFeignFallback.java index 1057a8ab..cb5ba01f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/fallback/FileFeignFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/file/feign/fallback/FileFeignFallback.java @@ -11,14 +11,14 @@ import org.springframework.stereotype.Component; @Component public class FileFeignFallback implements FileFeign { public CloudwalkResult init(FileInitParam param) { - throw new RuntimeException("文件初始化失败"); + return CloudwalkResult.fail("76260800", "文件初始化失败"); } public CloudwalkResult finish(FileFinishParam param) { - throw new RuntimeException("文件完成失败"); + return CloudwalkResult.fail("76260800", "文件完成失败"); } public CloudwalkResult get(FileGetParam param) { - throw new RuntimeException("查看文件详细信息失败"); + return CloudwalkResult.fail("76260800", "查看文件详细信息失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/DeviceImageStoreSyncFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/DeviceImageStoreSyncFeignClient.java index 91a426b8..d9bf5915 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/DeviceImageStoreSyncFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/DeviceImageStoreSyncFeignClient.java @@ -14,7 +14,7 @@ import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.imagestore.feign.fallback.DeviceImageStoreSyncFeignClientFallback; import java.util.List; import java.util.Map; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStoreFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStoreFeignClient.java index 92ca0b3d..bdcebd22 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStoreFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStoreFeignClient.java @@ -11,7 +11,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.imagestore.feign.fallback.ImageStoreFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStorePersonFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStorePersonFeignClient.java index bc69332d..61145246 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStorePersonFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/ImageStorePersonFeignClient.java @@ -11,7 +11,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.imagestore.result.ImgStoreB import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.imagestore.feign.fallback.ImageStorePersonFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/DeviceImageStoreSyncFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/DeviceImageStoreSyncFeignClientFallback.java index 8f612221..44e65423 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/DeviceImageStoreSyncFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/DeviceImageStoreSyncFeignClientFallback.java @@ -19,27 +19,27 @@ import org.springframework.stereotype.Component; @Component public class DeviceImageStoreSyncFeignClientFallback implements DeviceImageStoreSyncFeignClient { public CloudwalkResult> page(QueryDevicePersonSyncParam param) { - throw new RuntimeException("查询设备图库同步数据失败"); + return CloudwalkResult.fail("76260800", "查询设备图库同步数据失败"); } public CloudwalkResult> detail(QueryDevicePersonSyncLogParam param) { - throw new RuntimeException("查询图库同步数据失败"); + return CloudwalkResult.fail("76260800", "查询图库同步数据失败"); } public CloudwalkResult> logPage(QueryDevicePersonSyncLogParam param) { - throw new RuntimeException("查询设备图库同步日志数据失败"); + return CloudwalkResult.fail("76260800", "查询设备图库同步日志数据失败"); } public CloudwalkResult> getDeviceImageStore(QueryDevicePersonSyncLogParam param) { - throw new RuntimeException("查询设备关联图库列表败"); + return CloudwalkResult.fail("76260800", "查询设备关联图库列表败"); } public CloudwalkResult> deviceResync(DevicePersonResyncParam param) { - throw new RuntimeException("重新同步失败"); + return CloudwalkResult.fail("76260800", "重新同步失败"); } public CloudwalkResult> devicePersonResync(DevicePersonResyncRequestParam requestParam) { - throw new RuntimeException("已选人员重新同步失败"); + return CloudwalkResult.fail("76260800", "已选人员重新同步失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStoreFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStoreFeignClientFallback.java index ef8fd33d..85f1dc93 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStoreFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStoreFeignClientFallback.java @@ -16,26 +16,26 @@ import org.springframework.stereotype.Component; @Component public class ImageStoreFeignClientFallback implements ImageStoreFeignClient { public CloudwalkResult add(ImageStoreAddParam param) { - throw new RuntimeException("新增图库失败"); + return CloudwalkResult.fail("76260800", "新增图库失败"); } public CloudwalkResult edit(ImageStoreEditParam param) { - throw new RuntimeException("编辑图库失败"); + return CloudwalkResult.fail("76260800", "编辑图库失败"); } public CloudwalkResult> list(ImageStoreQueryParam param) { - throw new RuntimeException("查询图库失败"); + return CloudwalkResult.fail("76260800", "查询图库失败"); } public CloudwalkResult> page(ImageStoreQueryParam param) { - throw new RuntimeException("分页查询图库失败"); + return CloudwalkResult.fail("76260800", "分页查询图库失败"); } public CloudwalkResult delete(ImageStoreDelParam param) { - throw new RuntimeException("删除图库失败"); + return CloudwalkResult.fail("76260800", "删除图库失败"); } public CloudwalkResult detail(ImageStoreQueryParam param) { - throw new RuntimeException("查询图库详情失败"); + return CloudwalkResult.fail("76260800", "查询图库详情失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStorePersonFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStorePersonFeignClientFallback.java index e608cd09..f2c321b1 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStorePersonFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/imagestore/feign/fallback/ImageStorePersonFeignClientFallback.java @@ -16,26 +16,26 @@ import org.springframework.stereotype.Component; @Component public class ImageStorePersonFeignClientFallback implements ImageStorePersonFeignClient { public CloudwalkResult save(ImageStorePersonSaveParam param) { - throw new RuntimeException("图库人员新增或更新失败"); + return CloudwalkResult.fail("76260800", "图库人员新增或更新失败"); } public CloudwalkResult delete(ImageStorePersonDelParam param) { - throw new RuntimeException("图库人员删除失败"); + return CloudwalkResult.fail("76260800", "图库人员删除失败"); } public CloudwalkResult> page(ImageStorePersonQueryParam param) { - throw new RuntimeException("分页查询图库人员信息失败"); + return CloudwalkResult.fail("76260800", "分页查询图库人员信息失败"); } public CloudwalkResult bind(ImageStorePersonBindParam param) { - throw new RuntimeException("图库人员关系绑定失败"); + return CloudwalkResult.fail("76260800", "图库人员关系绑定失败"); } public CloudwalkResult batchBind(ImageStorePersonBindParam param) { - throw new RuntimeException("图库人员关系批量绑定失败"); + return CloudwalkResult.fail("76260800", "图库人员关系批量绑定失败"); } public CloudwalkResult updateGroupPersonRef(UpdateGroupPersonRefParam param) { - throw new RuntimeException("根据条件批量更新图库人员失败"); + return CloudwalkResult.fail("76260800", "根据条件批量更新图库人员失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/LabelFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/LabelFeignClient.java index 84278146..3f32b51f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/LabelFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/LabelFeignClient.java @@ -11,7 +11,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.label.result.LabelDetailRes import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.label.feign.fallback.LabelFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/fallback/LabelFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/fallback/LabelFeignClientFallback.java index 035c43b4..fdd0b0e7 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/fallback/LabelFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/label/feign/fallback/LabelFeignClientFallback.java @@ -16,30 +16,30 @@ import org.springframework.stereotype.Component; @Component public class LabelFeignClientFallback implements LabelFeignClient { public CloudwalkResult add(LabelAddParam param) { - throw new RuntimeException("新增标签失败"); + return CloudwalkResult.fail("76260800", "新增标签失败"); } public CloudwalkResult detail(LabelDetailParam param) { - throw new RuntimeException("获取标签详情失败"); + return CloudwalkResult.fail("76260800", "获取标签详情失败"); } public CloudwalkResult> getAll(LabelQueryParam param) { - throw new RuntimeException("获取所有标签失败"); + return CloudwalkResult.fail("76260800", "获取所有标签失败"); } public CloudwalkResult personsAdd(LabelPersonAddParam param) { - throw new RuntimeException("标签人员新增失败"); + return CloudwalkResult.fail("76260800", "标签人员新增失败"); } public CloudwalkResult personsDel(LabelPersonDelParam param) { - throw new RuntimeException("标签人员删除失败"); + return CloudwalkResult.fail("76260800", "标签人员删除失败"); } public CloudwalkResult delete(LabelGroupDelParam param) { - throw new RuntimeException("标签人员删除失败"); + return CloudwalkResult.fail("76260800", "标签人员删除失败"); } public CloudwalkResult edit(LabelGroupEditParam param) { - throw new RuntimeException("标签人员编辑失败"); + return CloudwalkResult.fail("76260800", "标签人员编辑失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/SmsSendFeign.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/SmsSendFeign.java index 9b2b34de..fa479072 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/SmsSendFeign.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/SmsSendFeign.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.message.param.SmsSendParam; import cn.cloudwalk.client.cwoscomponent.intelligent.message.result.ShotUrlResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.message.feign.fallback.SmsSendFeignFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/fallback/SmsSendFeignFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/fallback/SmsSendFeignFallback.java index 565680da..7e9e74f7 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/fallback/SmsSendFeignFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/message/feign/fallback/SmsSendFeignFallback.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Component; @Component public class SmsSendFeignFallback implements SmsSendFeign { public CloudwalkResult send(SmsSendParam param) { - throw new RuntimeException("发送短信失败"); + return CloudwalkResult.fail("76260800", "发送短信失败"); } public CloudwalkResult getShortUrl(GetShortUrlParam param) { - throw new RuntimeException("获取短连接失败"); + return CloudwalkResult.fail("76260800", "获取短连接失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/OrganizationFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/OrganizationFeignClient.java index 482fb036..ed9de61c 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/OrganizationFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/OrganizationFeignClient.java @@ -15,7 +15,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.organization.feign.fallback.OrganizationFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/fallback/OrganizationFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/fallback/OrganizationFeignClientFallback.java index f97308c8..f9757b80 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/fallback/OrganizationFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/organization/feign/fallback/OrganizationFeignClientFallback.java @@ -20,34 +20,34 @@ import org.springframework.stereotype.Component; @Component public class OrganizationFeignClientFallback implements OrganizationFeignClient { public CloudwalkResult> page(OrganizationQueryParam param) { - throw new RuntimeException("机构分页列表查询失败"); + return CloudwalkResult.fail("76260800", "机构分页列表查询失败"); } public CloudwalkResult> tree(OrganizationTreeParam param) { - throw new RuntimeException("机构树结构查询失败"); + return CloudwalkResult.fail("76260800", "机构树结构查询失败"); } public CloudwalkResult> list(OrganizationListParam param) { - throw new RuntimeException("机构全量列表查询失败"); + return CloudwalkResult.fail("76260800", "机构全量列表查询失败"); } public CloudwalkResult add(OrganizationAddParam param) { - throw new RuntimeException("新增机构失败"); + return CloudwalkResult.fail("76260800", "新增机构失败"); } public CloudwalkResult edit(OrganizationEditParam param) { - throw new RuntimeException("编辑机构失败"); + return CloudwalkResult.fail("76260800", "编辑机构失败"); } public CloudwalkResult editRent(RentUpdateParam param) { - throw new RuntimeException("编辑机构租赁失败"); + return CloudwalkResult.fail("76260800", "编辑机构租赁失败"); } public CloudwalkResult delete(OrganizationDeleteParam param) { - throw new RuntimeException("删除机构失败"); + return CloudwalkResult.fail("76260800", "删除机构失败"); } public CloudwalkResult detail(OrganizationDetailQueryParam param) { - throw new RuntimeException("查询机构失败"); + return CloudwalkResult.fail("76260800", "查询机构失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/PersonFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/PersonFeignClient.java index dc68d8f1..855aa6f4 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/PersonFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/PersonFeignClient.java @@ -11,7 +11,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.person.feign.fallback.PersonFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/fallback/PersonFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/fallback/PersonFeignClientFallback.java index 59cb4e97..670eaf7f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/fallback/PersonFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/person/feign/fallback/PersonFeignClientFallback.java @@ -16,30 +16,30 @@ import org.springframework.stereotype.Component; @Component public class PersonFeignClientFallback implements PersonFeignClient { public CloudwalkResult add(PersonAddParam param) { - throw new RuntimeException("新增人员信息失败"); + return CloudwalkResult.fail("76260800", "新增人员信息失败"); } public CloudwalkResult edit(PersonEditParam param) { - throw new RuntimeException("编辑人员信息失败"); + return CloudwalkResult.fail("76260800", "编辑人员信息失败"); } public CloudwalkResult delete(PersonDelParam param) { - throw new RuntimeException("删除人员信息失败"); + return CloudwalkResult.fail("76260800", "删除人员信息失败"); } public CloudwalkResult detail(PersonDetailParam param) { - throw new RuntimeException("查询人员详情失败"); + return CloudwalkResult.fail("76260800", "查询人员详情失败"); } public CloudwalkResult> list(PersonQueryParam param) { - throw new RuntimeException("查询人员列表失败"); + return CloudwalkResult.fail("76260800", "查询人员列表失败"); } public CloudwalkResult> page(PersonQueryParam param) { - throw new RuntimeException("分页查询人员信息失败"); + return CloudwalkResult.fail("76260800", "分页查询人员信息失败"); } public CloudwalkResult batchimport(PersonImportParam param) { - throw new RuntimeException("人员批量导入失败"); + return CloudwalkResult.fail("76260800", "人员批量导入失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/AcsRecordThreeSendFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/AcsRecordThreeSendFeignClient.java index bc82af4a..ba5ffad7 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/AcsRecordThreeSendFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/AcsRecordThreeSendFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.record.result.AcsRecordThre import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.record.feign.fallback.AcsRecordThreeSendFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/fallback/AcsRecordThreeSendFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/fallback/AcsRecordThreeSendFeignClientFallback.java index 82dba62e..473c7536 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/fallback/AcsRecordThreeSendFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/record/feign/fallback/AcsRecordThreeSendFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class AcsRecordThreeSendFeignClientFallback implements AcsRecordThreeSendFeignClient { public CloudwalkResult> listByTime(AcsRecordThreeSendParam param) { - throw new RuntimeException("根据时间查询成功的开门记录（最多1000条）失败"); + return CloudwalkResult.fail("76260800", "根据时间查询成功的开门记录（最多1000条）失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/LoginFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/LoginFeignClient.java index 8a3ef4f0..12626459 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/LoginFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/LoginFeignClient.java @@ -4,7 +4,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.resource.param.ValidateLogi import cn.cloudwalk.client.cwoscomponent.intelligent.resource.result.ValidateLoginTokenResult; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.resource.feign.fallback.LoginFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/RoleFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/RoleFeignClient.java index a9f3742b..08ddde28 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/RoleFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/RoleFeignClient.java @@ -12,7 +12,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.resource.result.RoleResourc import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.resource.feign.fallback.RoleFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/LoginFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/LoginFeignClientFallback.java index a1233b69..0254878e 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/LoginFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/LoginFeignClientFallback.java @@ -9,6 +9,6 @@ import org.springframework.stereotype.Component; @Component public class LoginFeignClientFallback implements LoginFeignClient { public CloudwalkResult validateLoginToken(ValidateLoginTokenParam param) { - throw new RuntimeException("校验登录token失败"); + return CloudwalkResult.fail("76260800", "校验登录token失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/RoleFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/RoleFeignClientFallback.java index 51f50d29..e7477569 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/RoleFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/resource/feign/fallback/RoleFeignClientFallback.java @@ -17,30 +17,30 @@ import org.springframework.stereotype.Component; @Component public class RoleFeignClientFallback implements RoleFeignClient { public CloudwalkResult> gets(RoleGetsParam param) { - throw new RuntimeException("查询角色详情失败"); + return CloudwalkResult.fail("76260800", "查询角色详情失败"); } public CloudwalkResult add(RoleAddParam param) { - throw new RuntimeException("角色新增失败"); + return CloudwalkResult.fail("76260800", "角色新增失败"); } public CloudwalkResult> edit(RoleEditParam param) { - throw new RuntimeException("角色编辑失败"); + return CloudwalkResult.fail("76260800", "角色编辑失败"); } public CloudwalkResult delete(RoleDeltParam param) { - throw new RuntimeException("角色删除失败"); + return CloudwalkResult.fail("76260800", "角色删除失败"); } public CloudwalkResult> resourceQuery(RoleResourceQueryParam param) { - throw new RuntimeException("角色查询失败"); + return CloudwalkResult.fail("76260800", "角色查询失败"); } public CloudwalkResult resourceDel(RoleResourceDelParam param) { - throw new RuntimeException("角色删除资源失败"); + return CloudwalkResult.fail("76260800", "角色删除资源失败"); } public CloudwalkResult resourceAdd(RoleResourceAddParam param) { - throw new RuntimeException("角色失败"); + return CloudwalkResult.fail("76260800", "角色失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/SysettingAreaFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/SysettingAreaFeignClient.java index 88f56f34..a9463d08 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/SysettingAreaFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/SysettingAreaFeignClient.java @@ -5,7 +5,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.sysetting.result.AreaTreeRe import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.sysetting.feign.fallback.SysettingAreaFeignClientFallback; import java.util.List; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/fallback/SysettingAreaFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/fallback/SysettingAreaFeignClientFallback.java index 3a14c560..ed800cd6 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/fallback/SysettingAreaFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/sysetting/feign/fallback/SysettingAreaFeignClientFallback.java @@ -10,6 +10,6 @@ import org.springframework.stereotype.Component; @Component public class SysettingAreaFeignClientFallback implements SysettingAreaFeignClient { public CloudwalkResult> tree(DeviceAreaTreeParam param) { - throw new RuntimeException("查询设备区域树结构失败"); + return CloudwalkResult.fail("76260800", "查询设备区域树结构失败"); } } diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/UserFeignClient.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/UserFeignClient.java index 7c1665c0..d1bc494f 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/UserFeignClient.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/UserFeignClient.java @@ -8,7 +8,7 @@ import cn.cloudwalk.client.cwoscomponent.intelligent.user.result.UserDetailResul import cn.cloudwalk.cloud.page.CloudwalkPageAble; import cn.cloudwalk.cloud.result.CloudwalkResult; import cn.cloudwalk.rest.cwoscomponent.intelligent.user.feign.fallback.UserFeignClientFallback; -import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/fallback/UserFeignClientFallback.java b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/fallback/UserFeignClientFallback.java index 5976440a..187642e4 100644 --- a/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/fallback/UserFeignClientFallback.java +++ b/maven-intelligent-cwoscomponent/intelligent-cwoscomponent-rest/src/main/java/cn/cloudwalk/rest/cwoscomponent/intelligent/user/feign/fallback/UserFeignClientFallback.java @@ -13,18 +13,18 @@ import org.springframework.stereotype.Component; @Component public class UserFeignClientFallback implements UserFeignClient { public CloudwalkResult detail(UserDetailParam param) { - throw new RuntimeException("查询企业用户详情失败"); + return CloudwalkResult.fail("76260800", "查询企业用户详情失败"); } public CloudwalkResult detail(String userId) { - throw new RuntimeException("查询企业用户账户详情失败"); + return CloudwalkResult.fail("76260800", "查询企业用户账户详情失败"); } public CloudwalkResult> page(UserQueryParam param) { - throw new RuntimeException("分页查询企业用户账户失败"); + return CloudwalkResult.fail("76260800", "分页查询企业用户账户失败"); } public CloudwalkResult changePwd(UserChangePwdParam param) { - throw new RuntimeException("用户修改密码失败"); + return CloudwalkResult.fail("76260800", "用户修改密码失败"); } }