修改配置方法

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.java

@@ -3,6 +3,7 @@ package com.chinaitop.depot.basic.mapper;
 import com.chinaitop.depot.basic.model.DRyxxsjyVO;
 import com.chinaitop.depot.basic.model.vo.*;
 import com.chinaitop.depot.basic.param.DRyxxsjyPageParam;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -32,5 +33,5 @@ public interface DRyxxsjyMapper {
 
     List<ZwlxbgjlVO> getZwlxbgjlListById(String sfzh);
 
-    String getSptFileUrl();
+    String getSptFileUrl(@Param("orgId") Integer orgId, @Param("sptFileUrl") String sptFileUrl);
 }

src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.xml

@@ -136,7 +136,7 @@
         where
             zw.rysfzh = #{sfzh}
     </select>
-    <select id="getSptFileUrl" parameterType="object" resultType="java.lang.String">
-      select s_val from sys_code where org_id = 10 and s_code = 'sptFileUrl'
+    <select id="getSptFileUrl" parameterType="java.lang.Object" resultType="java.lang.String">
+      select s_val from sys_code where org_id = #{orgId} and s_code = #{sptFileUrl}
     </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/impl/DRyxxsjyServiceImpl.java

@@ -45,9 +45,12 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
             return dRyxxsjyVO;
         }
 
+        // 查询url
+        String sptFile = dRyxxsjyMapper.getSptFileUrl(10, "sptFileUrl");
+
         // 获取文件
         if (StringUtils.hasText(dRyxxsjyVO.getAvatorUrl())) {
-            FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getAvatorUrl());
+            FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getAvatorUrl(), sptFile);
             if (!ObjectUtils.isEmpty(data)) {
                 dRyxxsjyVO.setFileUrl(data.getLink());
                 dRyxxsjyVO.setFileName(data.getName());
@@ -72,7 +75,7 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
             // 文件
             rotaterotateVOList.forEach(rotateVO -> {
                 if (StringUtils.hasText(rotateVO.getSerialNumber())) {
-                    FileObject data = fileUrlUtil.getData(rotateVO.getSerialNumber());
+                    FileObject data = fileUrlUtil.getData(rotateVO.getSerialNumber(), sptFile);
                     if (!ObjectUtils.isEmpty(data)) {
                         rotateVO.setFileUrl(data.getLink());
                         rotateVO.setFileName(data.getName());
@@ -92,7 +95,7 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
             // 文件
             reportVOList.forEach(reportVO -> {
                 if (StringUtils.hasText(reportVO.getFjid())) {
-                    FileObject data = fileUrlUtil.getData(reportVO.getFjid());
+                    FileObject data = fileUrlUtil.getData(reportVO.getFjid(), sptFile);
                     if (!ObjectUtils.isEmpty(data)) {
                         reportVO.setFileUrl(data.getLink());
                         reportVO.setFileName(data.getName());
@@ -107,7 +110,7 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
             // 文件
             certificatesVOList.forEach(certificatesVO -> {
                 if (StringUtils.hasText(certificatesVO.getFjid())) {
-                    FileObject data = fileUrlUtil.getData(certificatesVO.getFjid());
+                    FileObject data = fileUrlUtil.getData(certificatesVO.getFjid(), sptFile);
                     if (!ObjectUtils.isEmpty(data)) {
                         certificatesVO.setFileUrl(data.getLink());
                         certificatesVO.setFileName(data.getName());
@@ -121,7 +124,7 @@ public class DRyxxsjyServiceImpl implements DRyxxsjyService {
             List<RyfjFileVO> ryfjFileVOList = new ArrayList<>();
             String[] ryfjs = ryfjStrS.split(",");
             for (String ryfj : ryfjs) {
-                FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getRyfj());
+                FileObject data = fileUrlUtil.getData(dRyxxsjyVO.getRyfj(), sptFile);
                 if (!ObjectUtils.isEmpty(data)) {
                     RyfjFileVO ryfjFileVO = new RyfjFileVO();
                     ryfjFileVO.setRyfjFileUrl(data.getLink());

src/main/java/com/chinaitop/depot/utils/CustomFilter.java

@@ -1,3 +1,4 @@
+/*
 package com.chinaitop.depot.utils;
 
 import java.io.IOException;
@@ -81,12 +82,14 @@ public class CustomFilter implements Filter {
         }
     }
 
-	/**
+	*/
+/**
      * 判断本次请求的数据类型是否为上传文件
      *
      * @param request request
      * @return boolean
-     */
+     *//*
+
     private boolean isMultipart(ServletRequest request) {
     	boolean flag = request.getContentType().toLowerCase().startsWith("multipart/");
         if (request.getContentType() != null && flag) {
@@ -97,3 +100,4 @@ public class CustomFilter implements Filter {
    }
 
 }
+*/

src/main/java/com/chinaitop/depot/utils/FileUrlUtil.java

@@ -1,7 +1,6 @@
 package com.chinaitop.depot.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.chinaitop.depot.basic.mapper.DRyxxsjyMapper;
 import com.chinaitop.depot.basic.param.FileObject;
 import com.chinaitop.depot.basic.param.FileParam;
 import org.springframework.stereotype.Component;
@@ -21,8 +20,6 @@ import javax.annotation.Resource;
 public class FileUrlUtil {
     @Resource
     private RestTemplate restTemplate;
-    @Resource
-    private DRyxxsjyMapper dRyxxsjyMapper;
 
     /**
      * 获取市平台文件url
@@ -30,11 +27,9 @@ public class FileUrlUtil {
      * @param fileId
      * @return
      */
-    public FileObject getData(String fileId) {
+    public FileObject getData(String fileId, String sptFile) {
         MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
         sendMap.add("id", fileId);
-        // 查询数据
-        String sptFile = dRyxxsjyMapper.getSptFileUrl();
 
         String forObject = restTemplate.postForObject(String.format("%s%s", sptFile, "/file/findById"), sendMap, String.class);
         if (!ObjectUtils.isEmpty(forObject)) {

src/main/java/com/chinaitop/depot/utils/WebConfig.java

@@ -1,3 +1,4 @@
+/*
 package com.chinaitop.depot.utils;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -6,20 +7,24 @@ import org.springframework.context.annotation.Configuration;
 import java.util.ArrayList;
 import java.util.List;
 
+*/
 /**
  * @desc 注册bean, 将自定义过滤器添加到过滤器链中
  * @Author hf
  * @date 2019/3/11
  * @return
- */
+ *//*
+
 @Configuration
 public class WebConfig {
 
-   /**
+   */
+/**
     * 注册过滤器,有两种方式：
     * 1) 使用 @Component 注解<br>
     * 2) 添加到过滤器链中，此方式适用于使用第三方的过滤器。将过滤器写到 WebConfig 类中，如下：
-    */
+    *//*
+
    @Bean
    public FilterRegistrationBean filterRegistrationBean() {
 
@@ -37,3 +42,4 @@ public class WebConfig {
    }
 
 }
+*/