18339543638 2 лет назад
Родитель
Сommit
bd49133cac

+ 0 - 6
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/StorageFileServiceImpl.java

@@ -73,7 +73,6 @@ public class StorageFileServiceImpl implements IStorageFileService {
         for (SysStorageConfigDTO storageConfig : list) {
             fileClientFactory.createOrUpdateFileClient(storageConfig.getId(), storageConfig.getType(),parseClientConfig(storageConfig.getType(), storageConfig.getConfig()));
         }
-
     }
 
     @Override
@@ -82,14 +81,9 @@ public class StorageFileServiceImpl implements IStorageFileService {
         if(StrUtil.isEmpty(configId)){
             configId=defaultConfig.getId();
         }
-//        SysStorageConfigDTO config=defaultConfig;
-//        if(StrUtil.isNotEmpty(configId)){
-//            config=storageConfigService.selectSysStorageConfigById(configId);
-//        }
         FileClient fileClient = fileClientFactory.getFileClient(configId);
         String bizName = createBizName(filename);
         String suffix = FileUtil.extName(filename);
-//        FileClient fileClient = getClient(config);
         fileClient.upload(content,bizName);
         String downUrl = fileClient.downUrl(bizName);
         SysStorageRecordDTO record = SysStorageRecordDTO.builder()

+ 0 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/storage/service/impl/SysStorageConfigServiceImpl.java

@@ -100,7 +100,6 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
      * @author  lf
      * @date     2023/05/09 14:29
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean updateSysStorageConfigById(SysStorageConfigDTO source){
         SysStorageConfigPO config = SysStorageConfigMapper.INSTANCE.convertPO(source);
@@ -119,7 +118,6 @@ public class SysStorageConfigServiceImpl implements ISysStorageConfigService, Co
      * @date  2023/05/09 14:29
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public boolean insertSysStorageConfig(SysStorageConfigDTO source){
         Long count = baseRepository.selectCount(new LambdaQueryWrapper<>());
         boolean master=count==0;

+ 0 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysOrgServiceImpl.java

@@ -1,13 +1,10 @@
 package cn.tr.module.sys.user.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.utils.JsonUtils;
 import cn.tr.core.utils.TreeUtil;
-import cn.tr.module.sys.user.dto.SysOrgTreeDTO;
 import cn.tr.module.sys.user.mapper.SysOrgMapper;
 import cn.tr.module.sys.user.dto.SysOrgDTO;
 import cn.tr.module.sys.user.dto.SysOrgQueryDTO;

+ 1 - 1
tr-plugins/tr-spring-boot-starter-plugin-file/src/main/java/cn/tr/plugin/file/config/LocalFileClientFactory.java

@@ -28,7 +28,7 @@ public class LocalFileClientFactory implements FileClientFactory{
 
     @Override
     public <Config extends FileClientConfig> FileClient createOrUpdateFileClient(String configId, String storage, Config config) {
-        AbstractFileClient<Config> client = (AbstractFileClient<Config>) clients.get(configId);
+        AbstractFileClient<Config> client = null;
         client = this.createFileClient(configId, storage, config);
         client.init();
         clients.put(client.getId(), client);