diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/DevOpsReportApi.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/DevOpsReportApi.java index 857b8ea72..8d942b169 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/DevOpsReportApi.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/DevOpsReportApi.java @@ -38,7 +38,7 @@ import java.util.Map; public interface DevOpsReportApi { /** - * 汇报资源接口 + * 向DevOps一体化平台汇报资源 * * @param devOpsReportProperties DevOps平台的系统配置 * @param resourceDefinitions 资源汇报具体数据 diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/constants/ScannerConstants.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/constants/ScannerConstants.java index b219b8bb7..44552d11a 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/constants/ScannerConstants.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/constants/ScannerConstants.java @@ -57,4 +57,9 @@ public interface ScannerConstants { */ String VIEW_CONTROLLER_PATH_START_WITH = "/view"; + /** + * FieldMetadata类全路径 + */ + String FIELD_METADATA_CLASS_ALL_PATH = "cn.stylefeng.roses.kernel.scanner.api.pojo.resource.FieldMetadata"; + } diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportResourceParam.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportResourceParam.java index 9d48bfda6..07a2db2fe 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportResourceParam.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/pojo/devops/DevOpsReportResourceParam.java @@ -58,9 +58,15 @@ public class DevOpsReportResourceParam extends BaseRequest { */ private Map> resourceDefinitions; - public DevOpsReportResourceParam(String projectUniqueCode, String interactionToken, Map> resourceDefinitions) { + /** + * FieldMetadata类的全路径 + */ + private String fieldMetadataClassPath; + + public DevOpsReportResourceParam(String projectUniqueCode, String interactionToken, Map> resourceDefinitions, String fieldMetadataClassPath) { this.projectUniqueCode = projectUniqueCode; this.interactionToken = interactionToken; this.resourceDefinitions = resourceDefinitions; + this.fieldMetadataClassPath = fieldMetadataClassPath; } } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java index fa034d148..5597d11d6 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/constants/SystemConstants.java @@ -77,9 +77,4 @@ public interface SystemConstants { */ String THEME_GUNS_PLATFORM = "GUNS_PLATFORM"; - /** - * FieldMetadata类全路径 - */ - String FIELD_METADATA_CLASS_ALL_PATH = "cn.stylefeng.roses.kernel.scanner.api.pojo.resource.FieldMetadata"; - } diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java index 1d7ed40b6..3f20ac647 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java @@ -24,7 +24,6 @@ */ package cn.stylefeng.roses.kernel.system.modular.resource.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.LoginUserApi; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; @@ -37,13 +36,14 @@ import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; +import cn.stylefeng.roses.kernel.scanner.api.DevOpsReportApi; import cn.stylefeng.roses.kernel.scanner.api.ResourceReportApi; +import cn.stylefeng.roses.kernel.scanner.api.pojo.devops.DevOpsReportProperties; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ReportResourceParam; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceUrlParam; import cn.stylefeng.roses.kernel.system.api.ResourceServiceApi; import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; -import cn.stylefeng.roses.kernel.system.api.pojo.resource.ExternalResourceRequest; import cn.stylefeng.roses.kernel.system.api.pojo.resource.LayuiApiResourceTreeNode; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; import cn.stylefeng.roses.kernel.system.api.pojo.role.dto.SysRoleResourceDTO; @@ -73,7 +73,7 @@ import java.util.stream.Collectors; * @date 2020/11/23 22:45 */ @Service -public class SysResourceServiceImpl extends ServiceImpl implements SysResourceService, ResourceReportApi, ResourceServiceApi { +public class SysResourceServiceImpl extends ServiceImpl implements SysResourceService, ResourceReportApi, ResourceServiceApi, DevOpsReportApi { @Resource private SysResourceMapper resourceMapper; @@ -270,7 +270,6 @@ public class SysResourceServiceImpl extends ServiceImpl> resourceDefinitions) { + + // 获取运维平台相关配置 + + + // jwt秘钥生成 + + // 进行post请求,汇报资源 + + + } + /** * 创建wrapper *