Browse Source

上传到oss 目前访问地址时写死的

dev
pref_mail@163.com 4 months ago
parent
commit
f224bbe219
  1. 6
      blade-ops/blade-resource/src/main/java/org/springblade/resource/controller/OssController.java
  2. 3
      blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

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

@ -16,6 +16,7 @@
*/
package org.springblade.resource.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
@ -27,6 +28,7 @@ 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.annotation.PreAuth;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
@ -76,7 +78,9 @@ public class OssController extends BladeController {
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入oss")
public R<IPage<OssVO>> list(Oss oss, Query query) {
IPage<Oss> pages = ossService.page(Condition.getPage(query), Condition.getQueryWrapper(oss));
QueryWrapper<Oss> queryWrapper = Condition.getQueryWrapper(oss);
queryWrapper.eq("tenant_id", AuthUtil.getTenantId());
IPage<Oss> pages = ossService.page(Condition.getPage(query), queryWrapper);
return R.data(OssWrapper.build().pageVO(pages));
}

3
blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java

@ -263,8 +263,9 @@ public class OssEndpoint {
long endTime = System.currentTimeMillis();
log.info("Upload file {} from merge, start-end time: {}, {}", fileName, startTime, endTime);
bladeFile.setLink(bladeFile.getLink().replaceFirst("(http|https)://.*?/", "/minio/"));
// bladeFile.setLink(bladeFile.getLink().replaceFirst("(http|https)://.*?/", "/minio/"));
bladeFile.setDomain("http://files.huo5u.com/");
return R.data(bladeFile);
}
} catch (Exception e) {

Loading…
Cancel
Save