🎉 优化oss逻辑代码

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

@@ -23,7 +23,7 @@ import org.springblade.core.oss.rule.OssRule;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.entity.Oss;
-import org.springblade.resource.enums.OssCategoryEnum;
+import org.springblade.resource.enums.OssStatusEnum;
 import org.springblade.resource.enums.OssEnum;
 import org.springblade.resource.mapper.OssMapper;
 import org.springblade.resource.props.OssProperties;
@@ -40,7 +40,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
  */
 public class OssBuilder {
 
-	private static final String OSS_CODE = "oss:code:";
+	public static final String OSS_CODE = "oss:code:";
 
 	private final OssProperties ossProperties;
 	private final OssMapper ossMapper;
@@ -76,7 +76,7 @@ public class OssBuilder {
 		if (Func.hasEmpty(template, ossCached) || oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
 			synchronized (OssBuilder.class) {
 				template = templatePool.get(tenantCode);
-				if (template == null) {
+				if (Func.hasEmpty(template, ossCached) || oss.getEndpoint().equals(ossCached.getEndpoint()) || !oss.getAccessKey().equals(ossCached.getAccessKey())) {
 					if (oss.getCategory() == OssEnum.MINIO.getCategory()) {
 						template = MinioBuilder.template(oss, ossRule);
 					} else if (oss.getCategory() == OssEnum.QINIU.getCategory()) {
@@ -98,7 +98,7 @@ public class OssBuilder {
 	 */
 	public Oss getOss(String tenantCode) {
 		return CacheUtil.get(SYS_CACHE, OSS_CODE, tenantCode, () -> {
-			Oss o = ossMapper.selectOne(Wrappers.<Oss>query().lambda().eq(Oss::getCategory, OssCategoryEnum.ENABLE.getCategory()));
+			Oss o = ossMapper.selectOne(Wrappers.<Oss>query().lambda().eq(Oss::getStatus, OssStatusEnum.ENABLE.getNum()));
 			// 若为空则调用默认配置
 			if ((Func.isEmpty(o))) {
 				Oss defaultOss = new Oss();

blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java

@@ -22,15 +22,17 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.resource.builder.OssBuilder;
 import org.springblade.resource.entity.Oss;
-import org.springblade.resource.service.IOssService;
 import org.springblade.resource.entity.OssVO;
+import org.springblade.resource.service.IOssService;
 import org.springblade.resource.wrapper.OssWrapper;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -85,7 +87,6 @@ public class OssController extends BladeController {
 	 * 新增
 	 */
 	@PostMapping("/save")
-	@CacheEvict(cacheNames = {SYS_CACHE})
 	@ApiOperation(value = "新增", notes = "传入oss", position = 4)
 	public R save(@Valid @RequestBody Oss oss) {
 		return R.status(ossService.save(oss));
@@ -95,7 +96,6 @@ public class OssController extends BladeController {
 	 * 修改
 	 */
 	@PostMapping("/update")
-	@CacheEvict(cacheNames = {SYS_CACHE})
 	@ApiOperation(value = "修改", notes = "传入oss", position = 5)
 	public R update(@Valid @RequestBody Oss oss) {
 		return R.status(ossService.updateById(oss));
@@ -105,7 +105,6 @@ public class OssController extends BladeController {
 	 * 新增或修改
 	 */
 	@PostMapping("/submit")
-	@CacheEvict(cacheNames = {SYS_CACHE})
 	@ApiOperation(value = "新增或修改", notes = "传入oss", position = 6)
 	public R submit(@Valid @RequestBody Oss oss) {
 		return R.status(ossService.saveOrUpdate(oss));
@@ -116,7 +115,6 @@ public class OssController extends BladeController {
 	 * 删除
 	 */
 	@PostMapping("/remove")
-	@CacheEvict(cacheNames = {SYS_CACHE})
 	@ApiOperation(value = "逻辑删除", notes = "传入ids", position = 7)
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(ossService.deleteLogic(Func.toLongList(ids)));
@@ -127,9 +125,9 @@ public class OssController extends BladeController {
 	 * 启用
 	 */
 	@PostMapping("/enable")
-	@CacheEvict(cacheNames = {SYS_CACHE})
 	@ApiOperation(value = "配置启用", notes = "传入id", position = 7)
 	public R enable(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+		CacheUtil.evict(SYS_CACHE, OssBuilder.OSS_CODE, SecureUtil.getTenantCode());
 		return R.status(ossService.enable(id));
 	}
 

blade-ops/blade-resource/src/main/java/org/springblade/resource/enums/OssStatusEnum.java

@@ -26,7 +26,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum OssCategoryEnum {
+public enum OssStatusEnum {
 
 	/**
 	 * 关闭
@@ -41,6 +41,6 @@ public enum OssCategoryEnum {
 	/**
 	 * 类型编号
 	 */
-	final int category;
+	final int num;
 
 }