Merge branch 'xuhj-dev' into 'master'

Xuhj dev

See merge request dcuc-tjdsj/app-service!98

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/business/impl/FhAppSyncBusinessImpl.java

@@ -188,6 +188,7 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
         Long totalNum = responseParam.getTotalNum();
         log.info("同步获取的应用资源数量:{}", totalNum);
         List<FhResourceRespDTO> resources = responseParam.getResources();
+        log.info("同步获取的应用资源resources:{}", resources);
         List<ApplyInfo> applyInfos = convertToAppInfo(resources);
         return ResponseDTO.success("", applyInfos);
     }
@@ -198,6 +199,8 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
         RequestParam requestParam = new RequestParam();
         requestParam.setResourceType("0");
         requestParam.setCondition("");
+        requestParam.setCurrentPage("1");
+        requestParam.setPageSize("1000");
         FhAppIndexReqDTO reqDTO = new FhAppIndexReqDTO();
         reqDTO.setFrom("120000000000");
         reqDTO.setTo("120000000000");
@@ -213,7 +216,8 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
             log.error("调用同步接口响应异常. 响应结果:{}", JsonUtils.toJSONString(exchange));
             return ResponseDTO.fail("同步失败", (Object) null);
         }
-        String body = exchange.getBody();
+        String body = exchange.getBody();log.info("同步应用资源请求参数:{}", requestParam);
+        log.info("同步应用资源响应结果:{}", body);
         // 解析响应结果
         if (StringUtils.isBlank(body)) {
             log.error("同步应用资源,响应内容为空");
@@ -231,6 +235,7 @@ public class FhAppSyncBusinessImpl implements IFhAppSyncBusiness {
     }
 
     private void saveAppInfos(List<ApplyInfo> applyInfoList) {
+        log.info("解析同步结果applyInfoList:{}", applyInfoList);
         if (CollectionUtils.isEmpty(applyInfoList)) {
             return;
         }

dcuc-app-service/src/main/resources/application-app.yml

@@ -40,6 +40,6 @@ dcuc:
         data-catalog-url: http://10.201.8.40:9977
       resource-url: http://10.201.7.31:8585/bus/send
       bu-service-url: http://10.11.0.41:8081/ddos/v1/ministryResources/searchMinistryResources
-      fh:
-        app-sync:
-          address: http://130.0.56.186:10010/appmarket/app/resources/QueryAppResource
+    fh:
+      app-sync:
+        address: http://130.0.56.186:10010/appmarket/app/resources/QueryAppResource

dcuc-app-service/src/main/resources/application-base.yml

@@ -22,7 +22,7 @@ spring:
       max-file-size: 150MB
       max-request-size: 150MB
   redis:
-    host: 10.254.10.15
+    host: 127.0.0.1
     port: 6379
     password:
     jedis: