Sfoglia il codice sorgente

fix bug:请求BOSS时设置的token有问题

lijie 3 anni fa
parent
commit
103d8d9d74

+ 1 - 5
dmp-cloud/dmp-file/src/main/java/com/persagy/dmp/file/service/impl/CompatibleOldFileServiceImpl.java

@@ -288,11 +288,7 @@ public class CompatibleOldFileServiceImpl implements CompatibleOldFileService {
         }
         // 3.通过文件流的方式下载文件
         InputStream inputStream = service.download(fileInfo.getFileBucket(), fileInfo.getFilePath(), response, fileInfo.getFileName());
-        try {
-            IoUtil.copy(inputStream,response.getOutputStream());
-        }finally {
-            IoUtil.close(inputStream);
-        }
+        IoUtil.write(response.getOutputStream(),false,IoUtil.readBytes(inputStream));
         // 4.2021年12月22日12:00:21,先申请下载地址,然后通过重定向的方式直接请求文件服务器进行下载
 //        String fetchUrl = service.fetchUrl(fileInfo.getFileBucket(), fileInfo.getFilePath());
 //        if (StrUtil.isBlank(fetchUrl)){

+ 3 - 2
dmp-comp/dmp-auth-starter/src/main/java/com/persagy/dmp/auth/config/AuthFeignConfig.java

@@ -6,6 +6,7 @@ import feign.codec.Encoder;
 import feign.form.spring.SpringFormEncoder;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
@@ -25,10 +26,10 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT
  */
 @EnableFeignClients(basePackages="com.persagy.dmp.auth.**.client")
 @Configuration
-@RequiredArgsConstructor
 public class AuthFeignConfig {
 
-    private final ObjectFactory<HttpMessageConverters> messageConverters;
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
 
     @Bean
     @Primary

+ 1 - 1
dmp-comp/dmp-auth-starter/src/main/java/com/persagy/dmp/auth/config/AuthFeignInterceptor.java

@@ -18,6 +18,6 @@ public class AuthFeignInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         // 添加token
-        template.header("token", AppContext.getContext().getProjectId());
+        template.header("token", AppContext.getContext().getToken());
     }
 }