1.代码合并

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java

@@ -99,6 +99,30 @@ public class OssBuilder {
 		}
 	}
 
+	/**
+	 * 获取template
+	 * @param code 资源编号
+	 * @param tenantId 租户ID
+	 * @return 文件对象
+	 */
+	public OssTemplate template(String code, String tenantId) {
+		Oss oss = getOss(tenantId, code);
+
+		OssContext ossContext = new OssContext();
+		ossContext.setOss(oss);
+		ossContext.setOssProperties(ossProperties);
+		ossContext.setOssPool(ossPool);
+		ossContext.setTemplatePool(templatePool);
+
+		LiteflowResponse resp = flowExecutor.execute2Resp("ossChain", tenantId, ossContext);
+		if (resp.isSuccess()) {
+			OssContext contextBean = resp.getFirstContextBean();
+			return contextBean.getOssTemplate();
+		} else {
+			throw new ServiceException("未获取到对应的对象存储配置");
+		}
+	}
+
 	/**
 	 * 获取对象存储实体
 	 *

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -149,4 +149,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
 		return true;
 	}
 
+	@Override
+	public List<Tenant> selectTenantpageown() {
+		return null;
+	}
 }

pom.xml

@@ -90,13 +90,13 @@
 
 
     <!-- 本地打包部署jar  -->
-    <distributionManagement>
+<!--    <distributionManagement>-->
-        <repository>
+<!--        <repository>-->
-            <!--此名称要和.m2/settings.xml中设置的ID一致 -->
+<!--            &lt;!&ndash;此名称要和.m2/settings.xml中设置的ID一致 &ndash;&gt;-->
-            <id>logpm</id>
+<!--            <id>logpm</id>-->
-            <url>http://192.168.10.100:8081/repository/logpm-release/</url>
+<!--            <url>http://192.168.10.100:8081/repository/logpm-release/</url>-->
-        </repository>
+<!--        </repository>-->
-    </distributionManagement>
+<!--    </distributionManagement>-->
 
     <build>
         <finalName>${project.name}</finalName>