Commit dda02516 by guojuxing

资源组编辑验证码调整

parent 7d4c0414
...@@ -78,9 +78,9 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{ ...@@ -78,9 +78,9 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
UnionEnterpriseAuthDTO unionEnterpriseAuthDTO = unionEnterpriseAuthApiService UnionEnterpriseAuthDTO unionEnterpriseAuthDTO = unionEnterpriseAuthApiService
.getUnionEnterpriseAuthByResourceGroupId(resourceGroup.getResourceGroupId()).getResult(); .getUnionEnterpriseAuthByResourceGroupId(resourceGroup.getResourceGroupId()).getResult();
if (unionEnterpriseAuthDTO != null) { if (unionEnterpriseAuthDTO != null) {
ServiceResponse authCodeResult = authCodeApiService.validateAuthCode(resourceGroup.getAuthCodeId(), resourceGroup.getAuthCode()); //验证码验证
if (!authCodeResult.isSuccess()) { if (!"hasValid".equals(resourceGroup.getAuthCode())) {
return authCodeResult; return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "验证码未通过");
} }
ResourceGroupDTO oldResourceGroup = EntityUtil.changeEntityNew(ResourceGroupDTO.class, ResourceGroupDTO oldResourceGroup = EntityUtil.changeEntityNew(ResourceGroupDTO.class,
checkExistResourceGroup(resourceGroup.getResourceGroupId())); checkExistResourceGroup(resourceGroup.getResourceGroupId()));
......
...@@ -176,6 +176,15 @@ public class ResourceController { ...@@ -176,6 +176,15 @@ public class ResourceController {
return EnterpriseRestResponse.failure(result); return EnterpriseRestResponse.failure(result);
} }
@RequestMapping("/valid-auth-code")
public RestResponse validAuthCode(String authCode, Integer authCodeId) {
ServiceResponse authCodeResult = authCodeApiService.validateAuthCode(authCodeId, authCode);
if (!authCodeResult.isSuccess()) {
return RestResponse.failure(authCodeResult.getCode(), authCodeResult.getMessage());
}
return RestResponse.success();
}
@RequestMapping("/del-resource") @RequestMapping("/del-resource")
public RestResponse delResourceNew(Integer resourceGroupId) { public RestResponse delResourceNew(Integer resourceGroupId) {
return OperationResultUtils.operationResult(resourceGroupApiService.deleteResourceGroup(resourceGroupId), return OperationResultUtils.operationResult(resourceGroupApiService.deleteResourceGroup(resourceGroupId),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment