fix(v0.11): Feign/OpenFeign 与走查后续整改

- intelligent-cwoscomponent-rest：全部 Feign Fallback 改为 CloudwalkResult.fail(76260800, …)
- 各 FeignClient 与 cloudwalk-cloud-common POM 调整（与既有未提交变更一致）
- cloud：GroupEventListener 日志类名与异常分支收窄；校验切面 Pointcut 方法拼写修正
- elevator-web：AbstractCloudwalkController 请求上下文判空；getKey 停用明文密钥仅保留对时字段

Made-with: Cursor

maven-cloudwalk-cloud/cloudwalk-cloud-common/pom.xml

@@ -15,5 +15,5 @@
     <version>4.0.0-Brussels-SRX</version>
     <packaging>pom</packaging>
     <name>cloudwalk-cloud-common (stub parent)</name>
-    <description>与历史/私服已发布 JAR 中声明的 parent 对齐；聚合父工程见 cloudwalk-cloud-reactor。</description>
+    <description>本模块为 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。</description>
 </project>

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);

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 =

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) {

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<KeyValueResult> 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);
     }
 }

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;

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<AccountLoginResult> login(AccountLoginParam param) {
-        throw new RuntimeException("账户登录失败");
+        return CloudwalkResult.fail("76260800", "账户登录失败");
     }
 }

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;

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<Boolean> add(FaceAddParam param) {
-        throw new RuntimeException("新增人脸特征失败");
+        return CloudwalkResult.fail("76260800", "新增人脸特征失败");
     }
 
     public CloudwalkResult<Boolean> remove(FaceRemoveParam param) {
-        throw new RuntimeException("删除人脸特征失败");
+        return CloudwalkResult.fail("76260800", "删除人脸特征失败");
     }
 }

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;

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<FeatureExtractResult> extract(FeatureExtractParam param) {
-        throw new RuntimeException("提取特征失败");
+        return CloudwalkResult.fail("76260800", "提取特征失败");
     }
 }

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;

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<String> add(GroupAddParam param) {
-        throw new RuntimeException("新增图库失败");
+        return CloudwalkResult.fail("76260800", "新增图库失败");
     }
 
     public CloudwalkResult<GroupResult> get(GroupGetParam param) {
-        throw new RuntimeException("图库查询失败");
+        return CloudwalkResult.fail("76260800", "图库查询失败");
     }
 }

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;

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<List<SearchResult>> multiple(SearchMultipleParam param) {
-        throw new RuntimeException("1:N比对失败");
+        return CloudwalkResult.fail("76260800", "1:N比对失败");
     }
 }

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;

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;

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<List<SceneAppsResult>> getSceneApps(SceneAppsGetParam param) {
-        throw new RuntimeException("查询租户下所有的场景应用失败");
+        return CloudwalkResult.fail("76260800", "查询租户下所有的场景应用失败");
     }
 }

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<ApplicationImageStoreResult>> list(ApplicationImageStoreQueryParam param) {
-        throw new RuntimeException("查询应用图库关联失败");
+        return CloudwalkResult.fail("76260800", "查询应用图库关联失败");
     }
 
     public CloudwalkResult<Boolean> add(ApplicationImageStoreAddParam param) {
-        throw new RuntimeException("添加应用图库关联失败");
+        return CloudwalkResult.fail("76260800", "添加应用图库关联失败");
     }
 
     public CloudwalkResult<Boolean> delete(ApplicationImageStoreDelParam param) {
-        throw new RuntimeException("删除应用图库关联失败");
+        return CloudwalkResult.fail("76260800", "删除应用图库关联失败");
     }
 }

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;

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<FeatureExtractResult> extract(FeatureExtractParam param) {
-        throw new RuntimeException("特征提取失败");
+        return CloudwalkResult.fail("76260800", "特征提取失败");
     }
 
     public CloudwalkResult<List<FeatureQueryResult>> query(FeatureQueryParam param) {
-        throw new RuntimeException("图库识别，返回所有图库topN失败");
+        return CloudwalkResult.fail("76260800", "图库识别，返回所有图库topN失败");
     }
 
     public CloudwalkResult<Map<String, List<FeatureQueryResult>>> querygroups(FeatureQueryParam param) {
-        throw new RuntimeException("图库识别，返回每个图库topN失败");
+        return CloudwalkResult.fail("76260800", "图库识别，返回每个图库topN失败");
     }
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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<Boolean> add(DeviceApplicationParam param) {
-        throw new RuntimeException("添加设备应用关联关系失败");
+        return CloudwalkResult.fail("76260800", "添加设备应用关联关系失败");
     }
 
     public CloudwalkResult<Boolean> delete(DeviceApplicationParam param) {
-        throw new RuntimeException("删除设备应用关联关系失败");
+        return CloudwalkResult.fail("76260800", "删除设备应用关联关系失败");
     }
 
     public CloudwalkResult<List<DeviceApplicationResult>> list(DeviceApplicationQueryParam param) {
-        throw new RuntimeException("设备应用关联信息列表查询失败");
+        return CloudwalkResult.fail("76260800", "设备应用关联信息列表查询失败");
     }
 }

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<DeviceAreaResult>> list(DeviceAreaQueryParam param) {
-        throw new RuntimeException("查询区域信息列表失败");
+        return CloudwalkResult.fail("76260800", "查询区域信息列表失败");
     }
 
     public CloudwalkResult<Boolean> delete(DeviceAreaDeleteParam param) {
-        throw new RuntimeException("删除区域失败");
+        return CloudwalkResult.fail("76260800", "删除区域失败");
     }
 }

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<DeviceDistrictResult>> list(DeviceDistrictQueryParam param) {
-        throw new RuntimeException("查询省市区列表信息失败");
+        return CloudwalkResult.fail("76260800", "查询省市区列表信息失败");
     }
 }

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<DeviceResult>> list(DeviceQueryParam param) {
-        throw new RuntimeException("查询设备信息列表失败");
+        return CloudwalkResult.fail("76260800", "查询设备信息列表失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<DeviceResult>> page(DeviceQueryParam param) {
-        throw new RuntimeException("分页查询设备信息列表失败");
+        return CloudwalkResult.fail("76260800", "分页查询设备信息列表失败");
     }
 
     public CloudwalkResult<DeviceStatusResult> statusCount(String businessId) {
-        throw new RuntimeException("设备状态统计失败");
+        return CloudwalkResult.fail("76260800", "设备状态统计失败");
     }
 
     public CloudwalkResult<Boolean> delete(DeviceDeleteParam param) {
-        throw new RuntimeException("删除设备信息失败");
+        return CloudwalkResult.fail("76260800", "删除设备信息失败");
     }
 }

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<Boolean> add(DeviceImageStoreParam param) {
-        throw new RuntimeException("添加设备图库关联失败");
+        return CloudwalkResult.fail("76260800", "添加设备图库关联失败");
     }
 
     public CloudwalkResult<Boolean> delete(DeviceImageStoreParam param) {
-        throw new RuntimeException("删除设备图库关联失败");
+        return CloudwalkResult.fail("76260800", "删除设备图库关联失败");
     }
 
     public CloudwalkResult<Boolean> save(DeviceImageStoreSaveParam param) {
-        throw new RuntimeException("保存设备图库关联失败");
+        return CloudwalkResult.fail("76260800", "保存设备图库关联失败");
     }
 
     public CloudwalkResult<List<DeviceImageStoreResult>> list(DeviceImageStoreQueryParam param) {
-        throw new RuntimeException("查询设备图库关联失败");
+        return CloudwalkResult.fail("76260800", "查询设备图库关联失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<DeviceImageStoreResult>> page(DeviceImageStoreQueryParam param) {
-        throw new RuntimeException("分页查询设备图库关联失败");
+        return CloudwalkResult.fail("76260800", "分页查询设备图库关联失败");
     }
 }

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<UpdatePersonResult> updatePerson(UpdatePersonParam param) {
-        throw new RuntimeException("请求更新人员信息失败");
+        return CloudwalkResult.fail("76260800", "请求更新人员信息失败");
     }
 }

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<DeviceSettingNotifyResult> notifySetting(DeviceSettingNotifyParam param) {
-        throw new RuntimeException("下发终端设置参数失败");
+        return CloudwalkResult.fail("76260800", "下发终端设置参数失败");
     }
 
     public CloudwalkResult<EntranceGuardControlResult> entranceGuardControl(EntranceGuardControlParam param) {
-        throw new RuntimeException("下发开关门控制失败");
+        return CloudwalkResult.fail("76260800", "下发开关门控制失败");
     }
 }

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<List<DeviceSettingResult>> query(DeviceSettingQueryParam param) {
-        throw new RuntimeException("查询设备配置列表失败");
+        return CloudwalkResult.fail("76260800", "查询设备配置列表失败");
     }
 
     public CloudwalkResult<List<DeviceSettingInitResult>> init(DeviceSettingInitParam param) {
-        throw new RuntimeException("查询设备第一次上传数据内容失败");
+        return CloudwalkResult.fail("76260800", "查询设备第一次上传数据内容失败");
     }
 }

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<List<DeviceTypeResult>> get(DeviceTypeQueryParam param) {
-        throw new RuntimeException("查询设备类型信息返回树型数据结构失败");
+        return CloudwalkResult.fail("76260800", "查询设备类型信息返回树型数据结构失败");
     }
 }

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;

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<Boolean> addVisitor(AcsPersonAddVisitorParam param) {
-        throw new RuntimeException("根据被访人添加访客派梯权限失败");
+        return CloudwalkResult.fail("76260800", "根据被访人添加访客派梯权限失败");
     }
 }

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;

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<Boolean> send(EmailSendParam param) {
-        throw new RuntimeException("邮件发送失败");
+        return CloudwalkResult.fail("76260800", "邮件发送失败");
     }
 }

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;
 

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<String> init(FileInitParam param) {
-        throw new RuntimeException("文件初始化失败");
+        return CloudwalkResult.fail("76260800", "文件初始化失败");
     }
 
     public CloudwalkResult<Boolean> finish(FileFinishParam param) {
-        throw new RuntimeException("文件完成失败");
+        return CloudwalkResult.fail("76260800", "文件完成失败");
     }
 
     public CloudwalkResult<FileDetail> get(FileGetParam param) {
-        throw new RuntimeException("查看文件详细信息失败");
+        return CloudwalkResult.fail("76260800", "查看文件详细信息失败");
     }
 }

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;

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;

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;

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<CloudwalkPageAble<DevicePersonSyncResult>> page(QueryDevicePersonSyncParam param) {
-        throw new RuntimeException("查询设备图库同步数据失败");
+        return CloudwalkResult.fail("76260800", "查询设备图库同步数据失败");
     }
 
     public CloudwalkResult<List<DevicePersonSyncDetailResult>> detail(QueryDevicePersonSyncLogParam param) {
-        throw new RuntimeException("查询图库同步数据失败");
+        return CloudwalkResult.fail("76260800", "查询图库同步数据失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<DevicePersonSyncLogResult>> logPage(QueryDevicePersonSyncLogParam param) {
-        throw new RuntimeException("查询设备图库同步日志数据失败");
+        return CloudwalkResult.fail("76260800", "查询设备图库同步日志数据失败");
     }
 
     public CloudwalkResult<Map<String, String>> getDeviceImageStore(QueryDevicePersonSyncLogParam param) {
-        throw new RuntimeException("查询设备关联图库列表败");
+        return CloudwalkResult.fail("76260800", "查询设备关联图库列表败");
     }
 
     public CloudwalkResult<List<DeviceImageStoreReSyncResult>> deviceResync(DevicePersonResyncParam param) {
-        throw new RuntimeException("重新同步失败");
+        return CloudwalkResult.fail("76260800", "重新同步失败");
     }
 
     public CloudwalkResult<List<DevicePersonResyncResult>>
         devicePersonResync(DevicePersonResyncRequestParam requestParam) {
-        throw new RuntimeException("已选人员重新同步失败");
+        return CloudwalkResult.fail("76260800", "已选人员重新同步失败");
     }
 }

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<String> add(ImageStoreAddParam param) {
-        throw new RuntimeException("新增图库失败");
+        return CloudwalkResult.fail("76260800", "新增图库失败");
     }
 
     public CloudwalkResult<Boolean> edit(ImageStoreEditParam param) {
-        throw new RuntimeException("编辑图库失败");
+        return CloudwalkResult.fail("76260800", "编辑图库失败");
     }
 
     public CloudwalkResult<List<ImageStoreListResult>> list(ImageStoreQueryParam param) {
-        throw new RuntimeException("查询图库失败");
+        return CloudwalkResult.fail("76260800", "查询图库失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<ImageStoreResult>> page(ImageStoreQueryParam param) {
-        throw new RuntimeException("分页查询图库失败");
+        return CloudwalkResult.fail("76260800", "分页查询图库失败");
     }
 
     public CloudwalkResult<Boolean> delete(ImageStoreDelParam param) {
-        throw new RuntimeException("删除图库失败");
+        return CloudwalkResult.fail("76260800", "删除图库失败");
     }
 
     public CloudwalkResult<ImageStoreDetailResult> detail(ImageStoreQueryParam param) {
-        throw new RuntimeException("查询图库详情失败");
+        return CloudwalkResult.fail("76260800", "查询图库详情失败");
     }
 }

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<ImageStorePersonSaveResult> save(ImageStorePersonSaveParam param) {
-        throw new RuntimeException("图库人员新增或更新失败");
+        return CloudwalkResult.fail("76260800", "图库人员新增或更新失败");
     }
 
     public CloudwalkResult<Boolean> delete(ImageStorePersonDelParam param) {
-        throw new RuntimeException("图库人员删除失败");
+        return CloudwalkResult.fail("76260800", "图库人员删除失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<ImageStorePersonResult>> page(ImageStorePersonQueryParam param) {
-        throw new RuntimeException("分页查询图库人员信息失败");
+        return CloudwalkResult.fail("76260800", "分页查询图库人员信息失败");
     }
 
     public CloudwalkResult<Boolean> bind(ImageStorePersonBindParam param) {
-        throw new RuntimeException("图库人员关系绑定失败");
+        return CloudwalkResult.fail("76260800", "图库人员关系绑定失败");
     }
 
     public CloudwalkResult<ImgStoreBatchBindPersonResult> batchBind(ImageStorePersonBindParam param) {
-        throw new RuntimeException("图库人员关系批量绑定失败");
+        return CloudwalkResult.fail("76260800", "图库人员关系批量绑定失败");
     }
 
     public CloudwalkResult<Boolean> updateGroupPersonRef(UpdateGroupPersonRefParam param) {
-        throw new RuntimeException("根据条件批量更新图库人员失败");
+        return CloudwalkResult.fail("76260800", "根据条件批量更新图库人员失败");
     }
 }

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;

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<String> add(LabelAddParam param) {
-        throw new RuntimeException("新增标签失败");
+        return CloudwalkResult.fail("76260800", "新增标签失败");
     }
 
     public CloudwalkResult<LabelDetailResult> detail(LabelDetailParam param) {
-        throw new RuntimeException("获取标签详情失败");
+        return CloudwalkResult.fail("76260800", "获取标签详情失败");
     }
 
     public CloudwalkResult<List<LabelDetailResult>> getAll(LabelQueryParam param) {
-        throw new RuntimeException("获取所有标签失败");
+        return CloudwalkResult.fail("76260800", "获取所有标签失败");
     }
 
     public CloudwalkResult<Boolean> personsAdd(LabelPersonAddParam param) {
-        throw new RuntimeException("标签人员新增失败");
+        return CloudwalkResult.fail("76260800", "标签人员新增失败");
     }
 
     public CloudwalkResult<Boolean> personsDel(LabelPersonDelParam param) {
-        throw new RuntimeException("标签人员删除失败");
+        return CloudwalkResult.fail("76260800", "标签人员删除失败");
     }
 
     public CloudwalkResult<Boolean> delete(LabelGroupDelParam param) {
-        throw new RuntimeException("标签人员删除失败");
+        return CloudwalkResult.fail("76260800", "标签人员删除失败");
     }
 
     public CloudwalkResult<Boolean> edit(LabelGroupEditParam param) {
-        throw new RuntimeException("标签人员编辑失败");
+        return CloudwalkResult.fail("76260800", "标签人员编辑失败");
     }
 }

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;

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<Boolean> send(SmsSendParam param) {
-        throw new RuntimeException("发送短信失败");
+        return CloudwalkResult.fail("76260800", "发送短信失败");
     }
 
     public CloudwalkResult<ShotUrlResult> getShortUrl(GetShortUrlParam param) {
-        throw new RuntimeException("获取短连接失败");
+        return CloudwalkResult.fail("76260800", "获取短连接失败");
     }
 }

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;

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<CloudwalkPageAble<OrganizationResult>> page(OrganizationQueryParam param) {
-        throw new RuntimeException("机构分页列表查询失败");
+        return CloudwalkResult.fail("76260800", "机构分页列表查询失败");
     }
 
     public CloudwalkResult<List<OrganizationTreeResult>> tree(OrganizationTreeParam param) {
-        throw new RuntimeException("机构树结构查询失败");
+        return CloudwalkResult.fail("76260800", "机构树结构查询失败");
     }
 
     public CloudwalkResult<List<OrganizationResult>> list(OrganizationListParam param) {
-        throw new RuntimeException("机构全量列表查询失败");
+        return CloudwalkResult.fail("76260800", "机构全量列表查询失败");
     }
 
     public CloudwalkResult<String> add(OrganizationAddParam param) {
-        throw new RuntimeException("新增机构失败");
+        return CloudwalkResult.fail("76260800", "新增机构失败");
     }
 
     public CloudwalkResult<Boolean> edit(OrganizationEditParam param) {
-        throw new RuntimeException("编辑机构失败");
+        return CloudwalkResult.fail("76260800", "编辑机构失败");
     }
 
     public CloudwalkResult<Boolean> editRent(RentUpdateParam param) {
-        throw new RuntimeException("编辑机构租赁失败");
+        return CloudwalkResult.fail("76260800", "编辑机构租赁失败");
     }
 
     public CloudwalkResult<Boolean> delete(OrganizationDeleteParam param) {
-        throw new RuntimeException("删除机构失败");
+        return CloudwalkResult.fail("76260800", "删除机构失败");
     }
 
     public CloudwalkResult<OrganizationDetailResult> detail(OrganizationDetailQueryParam param) {
-        throw new RuntimeException("查询机构失败");
+        return CloudwalkResult.fail("76260800", "查询机构失败");
     }
 }

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;

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<String> add(PersonAddParam param) {
-        throw new RuntimeException("新增人员信息失败");
+        return CloudwalkResult.fail("76260800", "新增人员信息失败");
     }
 
     public CloudwalkResult<Boolean> edit(PersonEditParam param) {
-        throw new RuntimeException("编辑人员信息失败");
+        return CloudwalkResult.fail("76260800", "编辑人员信息失败");
     }
 
     public CloudwalkResult<Boolean> delete(PersonDelParam param) {
-        throw new RuntimeException("删除人员信息失败");
+        return CloudwalkResult.fail("76260800", "删除人员信息失败");
     }
 
     public CloudwalkResult<PersonResult> detail(PersonDetailParam param) {
-        throw new RuntimeException("查询人员详情失败");
+        return CloudwalkResult.fail("76260800", "查询人员详情失败");
     }
 
     public CloudwalkResult<List<PersonResult>> list(PersonQueryParam param) {
-        throw new RuntimeException("查询人员列表失败");
+        return CloudwalkResult.fail("76260800", "查询人员列表失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<PersonResult>> page(PersonQueryParam param) {
-        throw new RuntimeException("分页查询人员信息失败");
+        return CloudwalkResult.fail("76260800", "分页查询人员信息失败");
     }
 
     public CloudwalkResult<Boolean> batchimport(PersonImportParam param) {
-        throw new RuntimeException("人员批量导入失败");
+        return CloudwalkResult.fail("76260800", "人员批量导入失败");
     }
 }

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;

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<List<AcsRecordThreeSendResult>> listByTime(AcsRecordThreeSendParam param) {
-        throw new RuntimeException("根据时间查询成功的开门记录（最多1000条）失败");
+        return CloudwalkResult.fail("76260800", "根据时间查询成功的开门记录（最多1000条）失败");
     }
 }

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;

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;

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<ValidateLoginTokenResult> validateLoginToken(ValidateLoginTokenParam param) {
-        throw new RuntimeException("校验登录token失败");
+        return CloudwalkResult.fail("76260800", "校验登录token失败");
     }
 }

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<List<RoleDetailResult>> gets(RoleGetsParam param) {
-        throw new RuntimeException("查询角色详情失败");
+        return CloudwalkResult.fail("76260800", "查询角色详情失败");
     }
 
     public CloudwalkResult<RoleDetailResult> add(RoleAddParam param) {
-        throw new RuntimeException("角色新增失败");
+        return CloudwalkResult.fail("76260800", "角色新增失败");
     }
 
     public CloudwalkResult<List<RoleDetailResult>> edit(RoleEditParam param) {
-        throw new RuntimeException("角色编辑失败");
+        return CloudwalkResult.fail("76260800", "角色编辑失败");
     }
 
     public CloudwalkResult<Boolean> delete(RoleDeltParam param) {
-        throw new RuntimeException("角色删除失败");
+        return CloudwalkResult.fail("76260800", "角色删除失败");
     }
 
     public CloudwalkResult<List<RoleResourceResult>> resourceQuery(RoleResourceQueryParam param) {
-        throw new RuntimeException("角色查询失败");
+        return CloudwalkResult.fail("76260800", "角色查询失败");
     }
 
     public CloudwalkResult<Boolean> resourceDel(RoleResourceDelParam param) {
-        throw new RuntimeException("角色删除资源失败");
+        return CloudwalkResult.fail("76260800", "角色删除资源失败");
     }
 
     public CloudwalkResult<Boolean> resourceAdd(RoleResourceAddParam param) {
-        throw new RuntimeException("角色失败");
+        return CloudwalkResult.fail("76260800", "角色失败");
     }
 }

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;

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<List<AreaTreeResult>> tree(DeviceAreaTreeParam param) {
-        throw new RuntimeException("查询设备区域树结构失败");
+        return CloudwalkResult.fail("76260800", "查询设备区域树结构失败");
     }
 }

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;

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<UserDetailResult> detail(UserDetailParam param) {
-        throw new RuntimeException("查询企业用户详情失败");
+        return CloudwalkResult.fail("76260800", "查询企业用户详情失败");
     }
 
     public CloudwalkResult<UserAcountDetailResult> detail(String userId) {
-        throw new RuntimeException("查询企业用户账户详情失败");
+        return CloudwalkResult.fail("76260800", "查询企业用户账户详情失败");
     }
 
     public CloudwalkResult<CloudwalkPageAble<UserDetailResult>> page(UserQueryParam param) {
-        throw new RuntimeException("分页查询企业用户账户失败");
+        return CloudwalkResult.fail("76260800", "分页查询企业用户账户失败");
     }
 
     public CloudwalkResult<Boolean> changePwd(UserChangePwdParam param) {
-        throw new RuntimeException("用户修改密码失败");
+        return CloudwalkResult.fail("76260800", "用户修改密码失败");
     }
 }