From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001 From: JaneYork <janeyork1314@163.com> Date: 星期五, 22 七月 2022 15:27:00 +0800 Subject: [PATCH] 主动设置文件公共读,适配天翼云OSS 主动设置文件公共读,适配天翼云OSS。 天翼云,即便bucket设置公共读,文件默认也是private,除非手动设置,详见天翼云:https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试: 所有兼容S3协议的OSS,已测试:阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛 --- ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java index de29793..1ff3579 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java @@ -106,9 +106,9 @@ Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!"); String keyProperty = tableInfo.getKeyProperty(); Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!"); - return SqlHelper.saveOrUpdateBatch(this.currentModelClass(), getClass(), log, entityList, batchSize, (sqlSession, entity) -> { + return SqlHelper.saveOrUpdateBatch(this.currentModelClass(), this.currentMapperClass(), log, entityList, batchSize, (sqlSession, entity) -> { Object idVal = tableInfo.getPropertyValue(entity, keyProperty); - String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.INSERT_ONE); + String sqlStatement = SqlHelper.getSqlStatement(this.currentMapperClass(), SqlMethod.SELECT_BY_ID); return StringUtils.checkValNull(idVal) || CollectionUtils.isEmpty(sqlSession.selectList(sqlStatement, entity)); }, (sqlSession, entity) -> { -- Gitblit v1.9.3