Merge branch 'master' into dev

# Conflicts: # lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java # lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java

Merge branch 'master' into dev
# Conflicts: # lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java # lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java
chentao
Showing 10 changed files with 111 additions and 63 deletions
lego-admin/src/main/java/com/lego/web/controller/system/SysOssController.java
lego-admin/src/main/resources/application-dev.yml
lego-core/src/main/java/com/lego/core/service/impl/AdvertServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/QuestionServiceImpl.java
lego-core/src/main/java/com/lego/core/service/impl/UpgradeServiceImpl.java
lego-system/src/main/java/com/lego/system/service/ISysOssService.java
lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java
--- a/lego-admin/src/main/java/com/lego/web/controller/system/SysOssController.java
View file @231bdf3
+++ b/lego-admin/src/main/java/com/lego/web/controller/system/SysOssController.java
View file @231bdf3
@@ -103,6 +103,9 @@ public class SysOssController extends BaseController {
    @DeleteMapping("/{ossIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] ossIds) {
+        for(Long id:ossIds){
+            iSysOssService.delete(id);
+        }
        return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true));
    }
--- a/lego-admin/src/main/resources/application-dev.yml
View file @231bdf3
+++ b/lego-admin/src/main/resources/application-dev.yml
View file @231bdf3
@@ -17,9 +17,9 @@ spring:
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://rm-bp13d3m8b478rn6f7do.mysql.rds.aliyuncs.com:3306/lego_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://localhost:3306/lego_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
-          password: gyongyi!1991
+          password: 1234a!
      hikari:
        # 最大连接池数量
        maxPoolSize: 20
--- a/lego-core/src/main/java/com/lego/core/service/impl/AdvertServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/AdvertServiceImpl.java
View file @231bdf3
@@ -7,19 +7,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.domain.PageQuery;
 import com.lego.common.core.page.TableDataInfo;
-import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.domin.Advert;
-import com.lego.core.domin.BuildingBlock;
-import com.lego.core.domin.Entirety;
 import com.lego.core.domin.bo.AdvertBo;
 import com.lego.core.domin.vo.AdvertVo;
-import com.lego.core.domin.vo.BuildingBlockVo;
-import com.lego.core.domin.vo.EntiretyVo;
 import com.lego.core.enums.StatusEnums;
 import com.lego.core.mapper.AdvertMapper;
 import com.lego.core.service.IAdvertService;
+import com.lego.system.domain.vo.SysOssVo;
+import com.lego.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -36,7 +33,7 @@ import java.util.List;
 @Service
 public class AdvertServiceImpl implements IAdvertService {
    private final AdvertMapper baseMapper;
-    private final OssService ossService;
+    private final ISysOssService iSysOssService;
    /**
     * 查询列表
@@ -51,7 +48,8 @@ public class AdvertServiceImpl implements IAdvertService {
        if (ObjectUtil.isNotEmpty(list)) {
            for (AdvertVo vo : list) {
                if (StrUtil.isNotBlank(vo.getOssId())) {
-                    vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                    vo.setOssUrl(oss.getUrl());
                }
            }
        }
@@ -68,7 +66,8 @@ public class AdvertServiceImpl implements IAdvertService {
        List<AdvertVo> list = baseMapper.selectVoList(Wrappers.<Advert>lambdaQuery().eq(Advert::getStatus, "1"));
        for (AdvertVo vo : list) {
            if (StrUtil.isNotBlank(vo.getOssId())) {
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        return list;
--- a/lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/BuildingBlockServiceImpl.java
View file @231bdf3
@@ -6,13 +6,11 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.page.TableDataInfo;
-import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.StreamUtils;
 import com.lego.core.annotation.LanguageAnnotation;
 import com.lego.core.domin.BuildingBlock;
 import com.lego.core.domin.Course;
-import com.lego.core.domin.Entirety;
 import com.lego.core.domin.bo.BuildingBlockBo;
 import com.lego.core.domin.bo.BuildingBlockQueryBo;
 import com.lego.core.domin.vo.BuildingBlockVo;
@@ -21,6 +19,8 @@ import com.lego.core.mapper.BuildingBlockMapper;
 import com.lego.core.mapper.CourseMapper;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.IEntiretyService;
+import com.lego.system.domain.vo.SysOssVo;
+import com.lego.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
@@ -43,8 +43,8 @@ import java.util.Set;
 public class BuildingBlockServiceImpl implements IBuildingBlockService {
    private final BuildingBlockMapper baseMapper;
    private final IEntiretyService entiretyService;
-    private final OssService ossService;
    private final CourseMapper courseMapper;
+    private final ISysOssService iSysOssService;
    /**
     * 查询所有列表(带分页)
@@ -69,7 +69,8 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
            for (BuildingBlockVo vo : list) {
                vo.setEntiretyName(entiretyMap.getOrDefault(vo.getEntiretyId(), new EntiretyVo()).getName());
                if (StrUtil.isNotBlank(vo.getOssId())) {
-                    vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                    vo.setOssUrl(oss.getUrl());
                }
            }
        }
@@ -98,7 +99,8 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
        List<BuildingBlockVo> list = baseMapper.selectVoList(null);
        for (BuildingBlockVo vo : list) {
            if (StrUtil.isNotBlank(vo.getOssId())) {
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        return list;
--- a/lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/CourseServiceImpl.java
View file @231bdf3
@@ -17,7 +17,6 @@ import com.lego.core.domin.bo.CourseQueryBo;
 import com.lego.core.domin.vo.BuildingBlockVo;
 import com.lego.core.domin.vo.CourseVo;
 import com.lego.core.mapper.CourseMapper;
-import com.lego.core.mapper.UpgradeMapper;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.ICourseService;
 import com.lego.system.domain.vo.SysOssVo;
@@ -41,7 +40,7 @@ import java.util.Set;
 public class CourseServiceImpl implements ICourseService {
    private final CourseMapper baseMapper;
    private final IBuildingBlockService buildingBlockService;
-    private final ISysOssService ossService;
+    private final ISysOssService iSysOssService;
    private final OssService ossUrlService;
    /**
@@ -63,19 +62,24 @@ public class CourseServiceImpl implements ICourseService {
            for (CourseVo vo : list) {
                vo.setBuildingBlockName(blockMap.getOrDefault(vo.getBuildingBlockId(), new BuildingBlockVo()).getName());
                if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
-                    vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));
+                    vo.setTwoDimensionalOssUrl(oss.getUrl());
                }
                if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
-                    vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId()));
+                    vo.setThreeDimensionalOssUrl(oss.getUrl());
                }
                if(StrUtil.isNotBlank(vo.getCaseOssId())){
-                    vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId()));
+                    vo.setCaseOssUrl(oss.getUrl());
                }
                if(StrUtil.isNotBlank(vo.getTeachingOssId())){
-                    vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTeachingOssId()));
+                    vo.setTeachingOssUrl(oss.getUrl());
                }
                if(StrUtil.isNotBlank(vo.getPptOssId())){
-                    vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId()));
+                    vo.setPptOssUrl(oss.getUrl());
                }
            }
        }
@@ -92,19 +96,24 @@ public class CourseServiceImpl implements ICourseService {
        List<CourseVo> list =  baseMapper.selectVoList(Wrappers.<Course>lambdaQuery().eq(Course::getBuildingBlockId, buildingBlockId));
        for (CourseVo vo : list) {
            if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
-                vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));
+                vo.setTwoDimensionalOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
-                vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId()));
+                vo.setThreeDimensionalOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getCaseOssId())){
-                vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId()));
+                vo.setCaseOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getTeachingOssId())){
-                vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTeachingOssId()));
+                vo.setTeachingOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getPptOssId())){
-                vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId()));
+                vo.setPptOssUrl(oss.getUrl());
            }
        }
        return list;
@@ -126,37 +135,48 @@ public class CourseServiceImpl implements ICourseService {
        List<CourseVo> list =  baseMapper.selectVoList(null);
        for (CourseVo vo : list) {
            if(StrUtil.isNotBlank(vo.getTwoDimensionalOssId())){
-                vo.setTwoDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalOssId()));
+                vo.setTwoDimensionalOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getTwoDimensionalUrl())){
-                vo.setTwoDimensionalUrl(ossUrlService.selectUrlByIds(vo.getTwoDimensionalUrl()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalUrl()));
+                vo.setTwoDimensionalUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getTwoDimensionalType())){
-                vo.setTwoDimensionalType(ossUrlService.selectUrlByIds(vo.getTwoDimensionalType()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTwoDimensionalType()));
+                vo.setTwoDimensionalType(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getThreeDimensionalOssId())){
-                vo.setThreeDimensionalOssUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalOssId()));
+                vo.setThreeDimensionalOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getThreeDimensionalUrl())){
-                vo.setThreeDimensionalUrl(ossUrlService.selectUrlByIds(vo.getThreeDimensionalUrl()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalUrl()));
+                vo.setThreeDimensionalUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getThreeDimensionalType())){
-                vo.setThreeDimensionalType(ossUrlService.selectUrlByIds(vo.getThreeDimensionalType()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getThreeDimensionalType()));
+                vo.setThreeDimensionalType(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getCaseOssId())){
-                vo.setCaseOssUrl(ossUrlService.selectUrlByIds(vo.getCaseOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCaseOssId()));
+                vo.setCaseOssUrl(oss.getUrl());
                vo.setCaseFileVoList(ossUrlService.selectFileVoByIds(vo.getCaseOssId()));
            }
            if(StrUtil.isNotBlank(vo.getTeachingOssId())){
-                vo.setTeachingOssUrl(ossUrlService.selectUrlByIds(vo.getTeachingOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getTeachingOssId()));
+                vo.setTeachingOssUrl(oss.getUrl());
                vo.setTeachingFileVoList(ossUrlService.selectFileVoByIds(vo.getTeachingOssId()));
            }
            if(StrUtil.isNotBlank(vo.getPptOssId())){
-                vo.setPptOssUrl(ossUrlService.selectUrlByIds(vo.getPptOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getPptOssId()));
+                vo.setPptOssUrl(oss.getUrl());
                vo.setPptFileVoList(ossUrlService.selectFileVoByIds(vo.getPptOssId()));
            }
            if(StrUtil.isNotBlank(vo.getOssId())){
-                vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        return list;
@@ -214,7 +234,7 @@ public class CourseServiceImpl implements ICourseService {
     */
    private void setCaseName(Course course) {
        if (StrUtil.isNotBlank(course.getCaseOssId())) {
-            SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
+            SysOssVo sysOssVo = iSysOssService.getById(Long.valueOf(course.getCaseOssId()));
            String suffix = sysOssVo.getFileSuffix();
            if (sysOssVo.getOriginalName().endsWith(suffix)) {
                course.setCaseName(sysOssVo.getOriginalName().replace(suffix, ""));
@@ -231,7 +251,7 @@ public class CourseServiceImpl implements ICourseService {
     */
    private void setTeachingName(Course course) {
        if (StrUtil.isNotBlank(course.getCaseOssId())) {
-            SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
+            SysOssVo sysOssVo = iSysOssService.getById(Long.valueOf(course.getCaseOssId()));
            String suffix = sysOssVo.getFileSuffix();
            if (sysOssVo.getOriginalName().endsWith(suffix)) {
                course.setTeachingName(sysOssVo.getOriginalName().replace(suffix, ""));
@@ -248,7 +268,7 @@ public class CourseServiceImpl implements ICourseService {
     */
    private void setPptName(Course course) {
        if (StrUtil.isNotBlank(course.getCaseOssId())) {
-            SysOssVo sysOssVo = ossService.getById(Long.valueOf(course.getCaseOssId()));
+            SysOssVo sysOssVo = iSysOssService.getById(Long.valueOf(course.getCaseOssId()));
            String suffix = sysOssVo.getFileSuffix();
            if (sysOssVo.getOriginalName().endsWith(suffix)) {
                course.setPptName(sysOssVo.getOriginalName().replace(suffix, ""));
--- a/lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/EntiretyServiceImpl.java
View file @231bdf3
@@ -2,12 +2,10 @@ package com.lego.core.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.domain.PageQuery;
 import com.lego.common.core.page.TableDataInfo;
-import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.common.utils.StreamUtils;
 import com.lego.common.utils.spring.SpringUtils;
@@ -21,12 +19,17 @@ import com.lego.core.mapper.BuildingBlockMapper;
 import com.lego.core.mapper.EntiretyMapper;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.IEntiretyService;
+import com.lego.system.domain.vo.SysOssVo;
+import com.lego.system.service.ISysOssService;
 import io.micrometer.core.instrument.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import java.rmi.ServerException;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 /**
 * 套件Service业务层处理
@@ -39,7 +42,7 @@ import java.util.*;
 public class EntiretyServiceImpl implements IEntiretyService {
    private final EntiretyMapper baseMapper;
    private final BuildingBlockMapper buildingBlockMapper;
-    private final OssService ossService;
+    private final ISysOssService iSysOssService;
    public IBuildingBlockService getBuildingBlockService() {
        return SpringUtils.getBean(IBuildingBlockService.class);
@@ -65,12 +68,16 @@ public class EntiretyServiceImpl implements IEntiretyService {
        List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList);
        for(BuildingBlockVo vo : buildingBlockList){
            if(StrUtil.isNotBlank(vo.getOssId())) {
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId);
        for(EntiretyVo vo:list){
-            vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+            if(StrUtil.isNotBlank(vo.getOssId())) {
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
+            }
            vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
        }
        return TableDataInfo.build(page);
@@ -86,12 +93,14 @@ public class EntiretyServiceImpl implements IEntiretyService {
        List<EntiretyVo> list = baseMapper.selectVoList(Wrappers.<Entirety>lambdaQuery().eq(Entirety::getLanguage, language).orderByAsc(Entirety::getSort));
        for(EntiretyVo vo:list){
            if(StrUtil.isNotBlank(vo.getOssId())){
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
            List<BuildingBlockVo> buildingBlockVoList = buildingBlockMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language).eq(BuildingBlock::getEntiretyId, vo.getId()));
            for(BuildingBlockVo blockVo:buildingBlockVoList){
                if(StrUtil.isNotBlank(blockVo.getOssId())){
-                    blockVo.setOssUrl(ossService.selectUrlByIds(blockVo.getOssId()));
+                    SysOssVo oss = iSysOssService.getById(Long.valueOf(blockVo.getOssId()));
+                    vo.setOssUrl(oss.getUrl());
                }
            }
            vo.setBuildingblockList(buildingBlockVoList);
@@ -110,7 +119,8 @@ public class EntiretyServiceImpl implements IEntiretyService {
        List<EntiretyVo> list = baseMapper.selectVoList(null);
        for(EntiretyVo vo:list){
            if(StrUtil.isNotBlank(vo.getOssId())){
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        return list;
--- a/lego-core/src/main/java/com/lego/core/service/impl/QuestionServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/QuestionServiceImpl.java
View file @231bdf3
@@ -5,10 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lego.common.core.page.TableDataInfo;
-import com.lego.common.core.service.OssService;
 import com.lego.common.utils.MessageUtils;
 import com.lego.core.annotation.LanguageAnnotation;
-import com.lego.core.domin.Course;
 import com.lego.core.domin.Question;
 import com.lego.core.domin.bo.QuestionBo;
 import com.lego.core.domin.bo.QuestionQueryBo;
@@ -16,6 +14,8 @@ import com.lego.core.domin.vo.QuestionVo;
 import com.lego.core.enums.StatusEnums;
 import com.lego.core.mapper.QuestionMapper;
 import com.lego.core.service.IQuestionService;
+import com.lego.system.domain.vo.SysOssVo;
+import com.lego.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@ import java.util.List;
 @Service
 public class QuestionServiceImpl implements IQuestionService {
    private final QuestionMapper baseMapper;
-    private final OssService ossService;
+    private final ISysOssService iSysOssService;
    /**
     * 查询列表
@@ -62,10 +62,12 @@ public class QuestionServiceImpl implements IQuestionService {
                vo.setShowStr(sb.substring(0, sb.length() - 1));
            }
            if(StrUtil.isNotBlank(vo.getCoverOssId())){
-                vo.setCoverOssUrl(ossService.selectUrlByIds(vo.getCoverOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCoverOssId()));
+                vo.setCoverOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getVideoOssId())){
-                vo.setVideoOssUrl(ossService.selectUrlByIds(vo.getVideoOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getVideoOssId()));
+                vo.setVideoOssUrl(oss.getUrl());
            }
        }
        return TableDataInfo.build(page);
@@ -93,10 +95,12 @@ public class QuestionServiceImpl implements IQuestionService {
                vo.setShowStr(sb.substring(0, sb.length() - 1));
            }
            if(StrUtil.isNotBlank(vo.getCoverOssId())){
-                vo.setCoverOssUrl(ossService.selectUrlByIds(vo.getCoverOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getCoverOssId()));
+                vo.setCoverOssUrl(oss.getUrl());
            }
            if(StrUtil.isNotBlank(vo.getVideoOssId())){
-                vo.setVideoOssUrl(ossService.selectUrlByIds(vo.getVideoOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getVideoOssId()));
+                vo.setVideoOssUrl(oss.getUrl());
            }
        }
        return list;
--- a/lego-core/src/main/java/com/lego/core/service/impl/UpgradeServiceImpl.java
View file @231bdf3
+++ b/lego-core/src/main/java/com/lego/core/service/impl/UpgradeServiceImpl.java
View file @231bdf3
@@ -19,6 +19,8 @@ import com.lego.core.domin.vo.*;
 import com.lego.core.enums.StatusEnums;
 import com.lego.core.mapper.UpgradeMapper;
 import com.lego.core.service.*;
+import com.lego.system.domain.vo.SysOssVo;
+import com.lego.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -35,12 +37,12 @@ import java.util.List;
 @Service
 public class UpgradeServiceImpl implements IUpgradeService {
    private final UpgradeMapper baseMapper;
-    private final OssService ossService;
    private final IAdvertService advertService;
    private final IEntiretyService entiretyService;
    private final IBuildingBlockService buildingBlockService;
    private final ICourseService courseService;
    private final IQuestionService questionService;
+    private final ISysOssService iSysOssService;
    @Override
    public ResourceVo list() {
@@ -81,7 +83,8 @@ public class UpgradeServiceImpl implements IUpgradeService {
        List<UpgradeVo> list = page.getRecords();
        for (UpgradeVo vo : list) {
            if (StrUtil.isNotBlank(vo.getFileOssId())) {
-                vo.setOssUrl(ossService.selectUrlByIds(vo.getFileOssId()));
+                SysOssVo oss = iSysOssService.getById(Long.valueOf(vo.getFileOssId()));
+                vo.setOssUrl(oss.getUrl());
            }
        }
        return TableDataInfo.build(page);
--- a/lego-system/src/main/java/com/lego/system/service/ISysOssService.java
View file @231bdf3
+++ b/lego-system/src/main/java/com/lego/system/service/ISysOssService.java
View file @231bdf3
@@ -35,4 +35,6 @@ public interface ISysOssService {
    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    void delete(Long ossId);
 }
--- a/lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java
View file @231bdf3
+++ b/lego-system/src/main/java/com/lego/system/service/impl/SysOssServiceImpl.java
View file @231bdf3
@@ -8,13 +8,11 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lego.common.core.service.ConfigService;
-import com.lego.system.domain.bo.SysOssBo;
-import com.lego.common.core.domain.dto.BizFileVo;
-import com.lego.system.service.ISysOssService;
 import com.lego.common.constant.CacheNames;
 import com.lego.common.core.domain.PageQuery;
+import com.lego.common.core.domain.dto.BizFileVo;
 import com.lego.common.core.page.TableDataInfo;
+import com.lego.common.core.service.ConfigService;
 import com.lego.common.core.service.OssService;
 import com.lego.common.exception.ServiceException;
 import com.lego.common.utils.BeanCopyUtils;
@@ -26,10 +24,13 @@ import com.lego.oss.entity.UploadResult;
 import com.lego.oss.enumd.AccessPolicyType;
 import com.lego.oss.factory.OssFactory;
 import com.lego.system.domain.SysOss;
+import com.lego.system.domain.bo.SysOssBo;
 import com.lego.system.domain.vo.SysOssVo;
 import com.lego.system.mapper.SysOssMapper;
+import com.lego.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -88,7 +89,6 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
    @Override
    public List<SysOssVo> listByIds(Collection<Long> ossIds) {
        List<SysOssVo> list = new ArrayList<>();
-        String baseUrl = configService.getConfigValue("sys.oss.baseUrl");
        for (Long id : ossIds) {
            SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
            if (ObjectUtil.isNotNull(vo)) {
@@ -276,6 +276,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
        }
        return baseMapper.deleteBatchIds(ids) > 0;
    }
+    @Override
+    @CacheEvict(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
+    public void delete(Long ossId){
+    }
    /**
     * 匹配Url