fix：合并1.0

src/main/java/com/lqkj/link/config/ThreadPoolConfig.java

@@ -5,6 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 @Configuration
 public class ThreadPoolConfig {

src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

@@ -1,6 +1,9 @@
 package com.lqkj.link.module.authority.service;
 
+import cn.hutool.core.util.RandomUtil;
+import com.lqkj.link.module.authority.domain.Captcha;
 import com.lqkj.link.module.authority.domain.UserInfo;
+import com.lqkj.link.module.authority.repository.CaptchaRepository;
 import com.lqkj.link.module.authority.repository.RoleInfoRepository;
 import com.lqkj.link.module.authority.repository.UserInfoRepository;
 import com.lqkj.link.util.FileUtils;

src/main/java/com/lqkj/link/util/AliOSSUtils.java

@@ -122,22 +122,6 @@ public class AliOSSUtils {
             }
         } while (result.isTruncated());
         return size;
-        try {
-            InputStream inputStream = file.getInputStream();
-            // 避免文件覆盖
-            String originalFilename = file.getOriginalFilename();
-            String fileName = "file/" + LocalDate.now() + "/" + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
-            //上传文件到 OSS
-            OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
-            threadPoolUtil.getTaskExecutor().execute(() -> {
-                ossClient.putObject(aliProperties.getBucketName(), fileName, inputStream);
-                ossClient.shutdown();
-            });
-            //文件访问路径
-            return aliProperties.getOsspath().split("//")[0] + "//" + aliProperties.getBucketName() + "." + aliProperties.getOsspath().split("//")[1] + "/" + fileName;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     public void deleteModel(String path) {