Merge branch 'master' of http://git.meloinfo.com/wangwei/interface_platform

src/main/java/com/hr/controller/AggregateController.java

@@ -1,5 +1,6 @@
 package com.hr.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.hr.dto.AggregateQueryDTO;
 import com.hr.externelSystem.BizHandlerFactory;
 import com.hr.param.AggregateRequest;
@@ -11,6 +12,7 @@ import com.hr.service.IpInterfaceService;
 import com.hr.vo.IpAccountVO;
 import com.hr.vo.IpInterfaceVO;
 import com.yy.basedevelop.common.data.BaseReturnDto;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@ import reactor.core.publisher.Mono;
  */
 @RestController
 @RequestMapping("/aggregate")
+@Slf4j
 public class AggregateController {
 
     @Autowired
@@ -41,6 +44,7 @@ public class AggregateController {
 
     @PostMapping("/openApi")
     public Mono<BaseReturnDto<Object>> aggregate(@RequestBody AggregateRequest req) {
+        log.info("openApi调用{}", req);
         String accountNo = req.getAccountNo();
         String interfaceCode = req.getInterfaceCode();
         IpAccountVO ipAccount = ipAccountService.queryByAccountNo(accountNo);
@@ -65,6 +69,8 @@ public class AggregateController {
         IpInterfacePO ipInterfacePO = new IpInterfacePO();
         BeanUtils.copyProperties(ipInterfaceVO, ipInterfacePO);
         dto.setIpInterfacePO(ipInterfacePO);
-        return Mono.just(bizHandlerFactory.dispatch(req,dto));
+        BaseReturnDto<Object> response = bizHandlerFactory.dispatch(req, dto);
+        log.info("openApi返回：{}", JSON.toJSONString(response));
+        return Mono.just(response);
     }
 }

src/main/java/com/hr/externelSystem/BizHandlerFactory.java

@@ -56,7 +56,6 @@ public class BizHandlerFactory {
         String data = req.getData();
         try {
             ApiLogDto logDto = new ApiLogDto();
-            IpTokenInterfacePO ipTokenInterfacePO = dto.getIpTokenInterfacePO();
             IpTokenPO ipTokenPO = dto.getIpTokenPO();
             String decrypt = AesUtil.decrypt(data, ipTokenPO.getSecret());
             Class requestClass = handler.getRequestClass();
@@ -65,6 +64,7 @@ public class BizHandlerFactory {
             ipOrderPO.setStatus("handle");
             ipOrderRepository.save(ipOrderPO);
             ipLogRepository.save(ipLogPO);
+            log.info("openApiHandle:{}",handler.getRequestClass());
             Object handle = handler.handle(o, ipInterfacePO,logDto);
             ipLogPO.setSystemResponse(JSON.toJSONString(handle));
             String errorMessage = logDto.getErrorMessage();

src/main/java/com/hr/service/impl/IpAccountServiceImpl.java

@@ -41,7 +41,7 @@ public class IpAccountServiceImpl implements IpAccountService {
 
 
     private static final Cache<String, IpAccountVO> QUERY_CACHE = CacheBuilder.newBuilder()
-            .expireAfterWrite(100, TimeUnit.SECONDS)
+            .expireAfterWrite(1, TimeUnit.SECONDS)
             .build();
 
     /** 

src/main/java/com/hr/service/impl/IpInterfaceServiceImpl.java

@@ -34,7 +34,7 @@ public class IpInterfaceServiceImpl implements IpInterfaceService {
     private IpInterfaceRepository ipInterfaceRepository;
 
     private static final Cache<String, IpInterfaceVO> QUERY_CACHE = CacheBuilder.newBuilder()
-            .expireAfterWrite(100, TimeUnit.SECONDS)
+            .expireAfterWrite(1, TimeUnit.SECONDS)
             .build();
     
     /** 

src/main/java/com/hr/service/impl/IpTokenInterfaceServiceImpl.java

@@ -53,7 +53,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
     private IpInterfaceRepository ipInterfaceRepository;
 
     private static final Cache<String, AggregateQueryDTO> QUERY_CACHE = CacheBuilder.newBuilder()
-            .expireAfterWrite(100, TimeUnit.SECONDS)
+            .expireAfterWrite(1, TimeUnit.SECONDS)
             .build();
     @Autowired
     private IpAccountService ipAccountService;
@@ -207,6 +207,7 @@ public class IpTokenInterfaceServiceImpl implements IpTokenInterfaceService {
             IpTokenInterfacePO po = new IpTokenInterfacePO();
             po.setAid(accountId);
             po.setIid(interfaceId);
+            po.setStatus("normal");
             Example<IpTokenInterfacePO> example = Example.of(po, matcher);
             List<IpTokenInterfacePO> interfacePOList = ipTokenInterfaceRepository.findAll(example);
             if(!interfacePOList.isEmpty()){