Feign远程调用获取静态目录与本地磁盘目录结果使用R包装类包装结果

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteFileService.java

@@ -75,7 +75,7 @@ public interface RemoteFileService {
      * @return 结果
      */
     @GetMapping(value = "/file/getLocalPathPrefix")
-    String getLocalPathPrefix();
+    R<String> getLocalPathPrefix();
 
     /**
      * 获取nginx静态目录前缀
@@ -83,7 +83,7 @@ public interface RemoteFileService {
      * @return 结果
      */
     @GetMapping(value = "/file/getStaticPathPrefix")
-    String getStaticPathPrefix();
+    R<String> getStaticPathPrefix();
 
     @PostMapping(value = "/file/registerBookCompressPdf",consumes = MediaType.APPLICATION_JSON_VALUE)
     Response registerBookCompressPdf(@RequestBody ExportPdfDto exportDto);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteFileFallbackFactory.java

@@ -57,12 +57,12 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             }
 
             @Override
-            public String getLocalPathPrefix() {
+            public R<String> getLocalPathPrefix() {
                 return null;
             }
 
             @Override
-            public String getStaticPathPrefix() {
+            public R<String> getStaticPathPrefix() {
                 return null;
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -754,8 +754,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
     private Map<String, Object> getFtlDrill(CoreDrillTaskDetailVo task) {
         Map<String, Object> data = new HashMap<>();
-        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
-        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
+        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
+        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
         String orgName = task.getOrgName();
         String drillSite = task.getDrillSite();
         String imageData = task.getImageList();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -781,8 +781,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         String recorderName = task.getRecorderName() == null ? StringUtil.EMPTY_STRING : task.getRecorderName();
         String content = task.getContent();
         String note = task.getNote();
-        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
-        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
+        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
+        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
         data.put("time", StringUtils.isNotEmpty(time) ? time : StringUtil.EMPTY_STRING);
         data.put("address", StringUtils.isNotEmpty(address) ? address : StringUtil.EMPTY_STRING);
         data.put("hostName", StringUtils.isNotEmpty(hostName) ? hostName : StringUtil.EMPTY_STRING);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -254,8 +254,8 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         final CoreIntroduceLetterApproveLog approveLog = letterMapper.findCheckLog(record.getLetterId(), record.getOrgId());
         final SysOrgVO inOrg = orgList.stream().filter(org -> ObjectUtil.equal(org.getId(), record.getOrgId())).findFirst().get();
         final SysOrgVO outOrg = orgList.stream().filter(org -> ObjectUtil.equal(org.getId(), record.getLetterOrgId())).findFirst().get();
-        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
-        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR);
+        String prefixPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getLocalPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
+        String staticsPath = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.getStaticPathPrefix(), ErrorMsgConstants.QUERY_FILE_PATH_ERROR).getData();
 
         Map<String, Object> data = new HashMap<>();
 

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/controller/SysFileController.java

@@ -178,14 +178,14 @@ public class SysFileController {
     }
     @ApiOperation(value = "获取本地存储路径前缀")
     @GetMapping(value = "/getLocalPathPrefix")
-    String getLocalPathPrefix() {
-        return this.localFilePath;
+    R<String> getLocalPathPrefix() {
+        return R.ok(this.localFilePath);
     }
 
     @ApiOperation(value = "获取nginx静态目录前缀")
     @GetMapping(value = "/getStaticPathPrefix")
-    String getStaticPathPrefix() {
-        return this.prefix;
+    R<String> getStaticPathPrefix() {
+        return R.ok(this.prefix);
     }