From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
index 56c30c2..bf6473a 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/builder/oss/OssBuilder.java
@@ -16,7 +16,9 @@
*/
package cn.gistack.resource.builder.oss;
+import cn.gistack.common.constant.CommonConstant;
import cn.gistack.resource.rule.MyOssRule;
+import cn.gistack.resource.rule.PanoramaOSSRule;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.core.cache.utils.CacheUtil;
@@ -86,6 +88,12 @@
return templateByPath(StringPool.EMPTY,prefixPath);
}
+
+
+ public OssTemplate templateByPrefixPathPanorama(String prefixPath ,String resGuid) {
+ return templateByPathPanorama(StringPool.EMPTY,prefixPath,resGuid);
+ }
+
/**
* 获取template
*
@@ -94,6 +102,11 @@
*/
public OssTemplate template(String code) {
String tenantId = AuthUtil.getTenantId();
+
+ if (StringUtil.isBlank(tenantId)){
+ tenantId = "000000";
+ }
+
Oss oss = getOss(tenantId, code);
Oss ossCached = ossPool.get(tenantId);
OssTemplate template = templatePool.get(tenantId);
@@ -139,7 +152,7 @@
Oss oss = getOss(tenantId, code);
OssTemplate template = templatePool.get(tenantId);
template = templatePool.get(tenantId);
- OssRule ossRule = new MyOssRule(Boolean.TRUE,prefixPath);
+ OssRule ossRule = new MyOssRule(Boolean.FALSE,prefixPath);
if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
template = MinioOssBuilder.template(oss, ossRule);
} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
@@ -155,6 +168,32 @@
}
/**
+ * 全景图片上传
+ * @param code
+ * @param prefixPath
+ * @return
+ */
+ public OssTemplate templateByPathPanorama(String code,String prefixPath,String resGuid) {
+ String tenantId = AuthUtil.getTenantId();
+ Oss oss = getOss(tenantId, code);
+ OssTemplate template = null;
+// template = templatePool.get(tenantId);
+ OssRule ossRule = new PanoramaOSSRule(Boolean.FALSE,prefixPath,resGuid);
+ if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
+ template = MinioOssBuilder.template(oss, ossRule);
+ } else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
+ template = QiniuOssBuilder.template(oss, ossRule);
+ } else if (oss.getCategory() == OssEnum.ALI.getCategory()) {
+ template = AliOssBuilder.template(oss, ossRule);
+ } else if (oss.getCategory() == OssEnum.TENCENT.getCategory()) {
+ template = TencentOssBuilder.template(oss, ossRule);
+ }
+// templatePool.put(tenantId, template);
+// ossPool.put(tenantId, oss);
+ return template;
+ }
+
+ /**
* 获取对象存储实体
*
* @param tenantId 租户ID
--
Gitblit v1.9.3