From 202811aa8ffea64127de156f2584ad556b1a1d11 Mon Sep 17 00:00:00 2001 From: zhang chengzhi <3144712872@qq.com> Date: Tue, 10 Sep 2024 14:41:49 +0800 Subject: [PATCH] 544245 --- .../java/com/muyu/rule/common/utils/OssUtil.java | 9 +++++---- .../controller/RuleEngineVersionController.java | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java index 5ed1839..a40e584 100644 --- a/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java +++ b/cloud-rule-common/src/main/java/com/muyu/rule/common/utils/OssUtil.java @@ -215,16 +215,17 @@ public class OssUtil { } } - -public static void deliteOssClient(String key){ + /** + * 根据buctName和oss名称删除 + * @param key 类名+ .class + */ + public static void deliteOssClient(String key){ OSS ossClient = new OSSClientBuilder().build(endPoint,accessKeyId,accessKeySecret); VoidResult voidResult = ossClient.deleteObject(bucketName, key); - log.info(voidResult); - } } diff --git a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java index 67d1247..7fffa71 100644 --- a/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java +++ b/cloud-rule-server/src/main/java/com/muyu/rule/server/controller/RuleEngineVersionController.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.muyu.common.core.domain.Result; import com.muyu.etl.domain.DataValue; +import com.muyu.rule.common.constant.SuffixClass; import com.muyu.rule.common.domain.DataValueFie; import com.muyu.rule.common.domain.DataValueRow; import com.muyu.rule.common.domain.DataValueRows; import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.rule.common.domain.req.VersionAddReq; import com.muyu.rule.common.utils.LoadEngineClass; +import com.muyu.rule.common.utils.OssUtil; import com.muyu.rule.server.service.RuleEngineVersionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -48,8 +50,12 @@ public class RuleEngineVersionController { log.info("==>"+ruleEngineVersion.getVersionClazz()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id",ruleEngineVersion.getId()).set("version_clazz",ruleEngineVersion.getVersionClazz()); - versionService.Upload(ruleEngineVersion.getVersionClazz(),ruleEngineVersion.getClassName()); versionService.update(updateWrapper); + //删除对应oss上的类 + OssUtil.deliteOssClient(ruleEngineVersion.getClassName()+SuffixClass.Suffix_CLASS); + //编译并上传 + versionService.complierClass(ruleEngineVersion.getClassName(),ruleEngineVersion.getVersionClazz()); + return Result.success(); } @@ -202,7 +208,11 @@ public class RuleEngineVersionController { } - + /** + * 从oss读取数据 + * @param className + * @return + */ @PostMapping("/readByOss/{className}") @Operation(summary = "从Oss获取数据", description = "传入参数oss的key名从oss读取数据")