资源组编辑验证码调整

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java

@@ -78,9 +78,9 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
         UnionEnterpriseAuthDTO unionEnterpriseAuthDTO = unionEnterpriseAuthApiService
                 .getUnionEnterpriseAuthByResourceGroupId(resourceGroup.getResourceGroupId()).getResult();
         if (unionEnterpriseAuthDTO != null) {
-            ServiceResponse authCodeResult = authCodeApiService.validateAuthCode(resourceGroup.getAuthCodeId(), resourceGroup.getAuthCode());
-            if (!authCodeResult.isSuccess()) {
-                return authCodeResult;
+            //验证码验证
+            if (!"hasValid".equals(resourceGroup.getAuthCode())) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "验证码未通过");
             }
             ResourceGroupDTO oldResourceGroup = EntityUtil.changeEntityNew(ResourceGroupDTO.class,
                     checkExistResourceGroup(resourceGroup.getResourceGroupId()));

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -176,6 +176,15 @@ public class ResourceController {
         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")
     public RestResponse delResourceNew(Integer resourceGroupId) {
         return OperationResultUtils.operationResult(resourceGroupApiService.deleteResourceGroup(resourceGroupId),