mirror of
https://github.com/hpd840321/starRiverProperty.git
synced 2026-06-09 08:20:31 +08:00
fix(v0.11): 第四轮走查——AKS 入参 Map 化、Resource SDK 占位与协议实体 UID
- AksAuthService / ApiSecretService:token、auth 入参由 JSONObject 改为 Map,降低对 fastjson 类型的耦合。
- cwos-java-sdk-resource:占位实现统一为 CloudwalkResult.fail(RestSdkEnum) 或 Collections.emptyList();补全 RestDictServiceImpl、RestApiServiceImpl;修正企业用户 Feign Fallback。
- cloudwalk-device-sdk-protocol-entity:为 Serializable 实体类补充 serialVersionUID。
Made-with: Cursor
Former-commit-id: 830d47141c
This commit is contained in:
+3
-2
@@ -12,6 +12,7 @@ import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
import cn.cloudwalk.cloud.page.CloudwalkPageAble;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.api.feign.ApiFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -75,13 +76,13 @@ return this.apiFeignClient.page(param);
|
||||
|
||||
|
||||
public List<ApiResult> queryByRoleIdsAndResourceIds(UserApiQueryParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public List<ApiResult> queryByUserIdWithApplication(UserApiQueryParam param) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-3
@@ -1,5 +1,6 @@
|
||||
package cn.cloudwalk.cwos.client.resource.dict.service;
|
||||
|
||||
import cn.cloudwalk.client.davinci.portal.common.enums.RestSdkEnum;
|
||||
import cn.cloudwalk.client.resource.dict.param.DictAddParam;
|
||||
import cn.cloudwalk.client.resource.dict.param.DictDeleteParam;
|
||||
import cn.cloudwalk.client.resource.dict.param.DictQueryCodeSParam;
|
||||
@@ -52,7 +53,7 @@ return this.dictFeignClient.page(param);
|
||||
|
||||
|
||||
public CloudwalkResult<List<DictQueryResult>> queryDictCodeS(DictQueryCodeSParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -67,7 +68,7 @@ return this.dictFeignClient.edit(param);
|
||||
|
||||
|
||||
public CloudwalkResult<Boolean> delete(DictDeleteParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +83,7 @@ return this.dictFeignClient.enable(param);
|
||||
|
||||
|
||||
public CloudwalkResult<DictBatchImportResult> batchImport(List<DictAddParam> paramList, CloudwalkCallContext context, int skipRowIndex) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -132,9 +132,8 @@ return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdk
|
||||
|
||||
public CloudwalkResult<EnterpriseUserResult> generalAddUser(EnterpriseUserNewInGeneralParam param) {
|
||||
this.logger.error("调用Davinci-portal服务,新增企业户接口异常");
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
+10
-9
@@ -17,6 +17,7 @@ import cn.cloudwalk.client.davinci.portal.enterprise.param.EnterpriseUserResetPw
|
||||
import cn.cloudwalk.client.davinci.portal.enterprise.result.EnterpriseDetailResult;
|
||||
import cn.cloudwalk.client.davinci.portal.enterprise.result.EnterpriseInfoResult;
|
||||
import cn.cloudwalk.client.davinci.portal.enterprise.result.EnterpriseUserResult;
|
||||
import cn.cloudwalk.client.davinci.portal.common.enums.RestSdkEnum;
|
||||
import cn.cloudwalk.client.davinci.portal.enterprise.service.PortalEnterpriseService;
|
||||
import cn.cloudwalk.client.resource.user.param.UserDeltParam;
|
||||
import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
@@ -43,7 +44,7 @@ private PortalEnterpriseUserFeignClient portalEnterpriseUserFeignClient;
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<EnterpriseInfoResult> add(EnterpriseNewParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 46 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +70,7 @@ public CloudwalkResult<EnterpriseDetailResult> detail(EnterpriseBasicParam param
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> enable(EnterpriseStatusParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 72 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -77,7 +78,7 @@ public CloudwalkResult<Boolean> enable(EnterpriseStatusParam param, CloudwalkCal
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> disable(EnterpriseStatusParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 80 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -85,7 +86,7 @@ public CloudwalkResult<Boolean> disable(EnterpriseStatusParam param, CloudwalkCa
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> relate(EnterpriseRelateParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 88 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -93,7 +94,7 @@ public CloudwalkResult<Boolean> relate(EnterpriseRelateParam param, CloudwalkCal
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> auth(EnterpriseAuthParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 96 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -101,7 +102,7 @@ public CloudwalkResult<Boolean> auth(EnterpriseAuthParam param, CloudwalkCallCon
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> resetPwd(EnterpriseBasicParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -109,7 +110,7 @@ return null;
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<CloudwalkPageAble<EnterpriseInfoResult>> page(EnterpriseInfoQueryParam param, CloudwalkPageInfo page, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +122,7 @@ return this.portalEnterpriseUserFeignClient.add(param);
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<EnterpriseUserResult> generalAddEnterpriseUser(EnterpriseUserNewInGeneralParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -159,7 +160,7 @@ return this.portalEnterpriseUserFeignClient.delete(param);
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<List<EnterpriseInfoResult>> query(EnterpriseInfoQueryParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -10,6 +10,7 @@ import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.group.feign.GroupRoleFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -48,7 +49,7 @@ return this.groupRoleFeignClient.query(param);
|
||||
|
||||
|
||||
public List<GroupRoleResult> query(UserGroupQueryParam param) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
public void deleteByRoleIds(List<String> roleIds) throws ServiceException {}
|
||||
|
||||
+2
-1
@@ -17,6 +17,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble;
|
||||
import cn.cloudwalk.cloud.page.CloudwalkPageInfo;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.resource.feign.ResourceFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -81,7 +82,7 @@ return this.resourceFeignClient.tree(param);
|
||||
|
||||
|
||||
public List<ResourceTreeResult> queryByRoleIds(RoleResQueryParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-2
@@ -16,6 +16,7 @@ import cn.cloudwalk.cloud.page.CloudwalkPageAble;
|
||||
import cn.cloudwalk.cloud.page.CloudwalkPageInfo;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.role.feign.RoleFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -84,14 +85,14 @@ return this.roleFeignClient.page(param);
|
||||
|
||||
|
||||
public List<RoleInfoResult> queryByUserId(UserRoleQueryParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public List<RoleInfoResult> queryByResourceIds(CommonResourceParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@ import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.user.feign.UserGroupFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -45,7 +46,7 @@ return this.userGroupFeignClient.query(param);
|
||||
|
||||
|
||||
public List<UserGroupResult> getUserGroupList(UserGroupQueryParam param) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
public void deleteByGroupIds(List<String> groupIds) throws ServiceException {}
|
||||
|
||||
+2
-1
@@ -7,6 +7,7 @@ import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.user.feign.UserResourceFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -39,7 +40,7 @@ return this.userResourceFeignClient.tree(param);
|
||||
|
||||
|
||||
public List<ResourceTreeResult> queryResourceByUserId(UserResQueryParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@ import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.user.feign.UserRoleFeignClient;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -45,7 +46,7 @@ return this.userRoleFeignClient.query(param);
|
||||
|
||||
|
||||
public List<UserRoleResult> getUserRoleList(UserRoleQueryParam param) throws ServiceException {
|
||||
return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
public void deleteByUserIds(List<String> userIds) throws ServiceException {}
|
||||
|
||||
+6
-4
@@ -10,6 +10,7 @@ import cn.cloudwalk.client.resource.user.param.UserNewParam;
|
||||
import cn.cloudwalk.client.resource.user.param.UserQueryParam;
|
||||
import cn.cloudwalk.client.resource.user.param.UserStatusParam;
|
||||
import cn.cloudwalk.client.resource.user.result.UserQueryResult;
|
||||
import cn.cloudwalk.client.davinci.portal.common.enums.RestSdkEnum;
|
||||
import cn.cloudwalk.client.resource.user.service.UserService;
|
||||
import cn.cloudwalk.cloud.context.CloudwalkCallContext;
|
||||
import cn.cloudwalk.cloud.exception.ServiceException;
|
||||
@@ -19,6 +20,7 @@ import cn.cloudwalk.cloud.result.CloudwalkResult;
|
||||
import cn.cloudwalk.cwos.client.resource.user.feign.UserFeignClient;
|
||||
import cn.cloudwalk.data.resource.entity.resource.UserAdminPageDTO;
|
||||
import cn.cloudwalk.data.resource.entity.user.User;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
@@ -43,7 +45,7 @@ public CloudwalkResult<Boolean> edit(UserEditParam param, CloudwalkCallContext c
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<Boolean> editPicturePath(UserEditPicturePathParam userEditPicturePathParam, CloudwalkCallContext cloudwalkCallContext) throws ServiceException {
|
||||
/* 46 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
@@ -89,20 +91,20 @@ public CloudwalkResult<CloudwalkPageAble<UserQueryResult>> page(UserQueryParam p
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<UserQueryResult> getById(String id, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 92 */ return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Deprecated
|
||||
public List<User> queryByRoleIds(CommonResourceParam param, CloudwalkCallContext context) throws ServiceException {
|
||||
/* 99 */ return null;
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
|
||||
@Deprecated
|
||||
public CloudwalkResult<CloudwalkPageAble<UserAdminPageDTO>> pageByServiceCode(AdminUserPageQueryParam adminUserPageQueryParam, CloudwalkPageInfo cloudwalkPageInfo) throws ServiceException {
|
||||
return null;
|
||||
return CloudwalkResult.fail(RestSdkEnum.FALLBACK_COMMON_ERROR.getCode(), RestSdkEnum.FALLBACK_COMMON_ERROR.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user