签名方式改造

dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java

@@ -70,6 +70,7 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
      */
     @Override
     public boolean insert(EmailMaintainVo emailMaintain) {
+        DynamicContextHolder.push(DbConstant.BASICS_READ);
         if(StringUtils.isEmpty(emailMaintain.getId())){
             emailMaintain.setId(IdUtil.nanoId());
         }

dxhy-erp/src/main/java/com/dxhy/erp/controller/InterfaceController.java

@@ -106,6 +106,8 @@ public class InterfaceController extends AbstractController {
     private IReceiptOutService iReceiptOutService;
     @Resource
     private VoucherRecordService voucherRecordService;
+    @Value("${erp.ipUrl}")
+    private String ipUrl;
 
     /**
      * 
@@ -149,7 +151,7 @@ public class InterfaceController extends AbstractController {
             /**
              * 鉴权
              */
-            result = authV5(request, dxhyInterfaceRequest,secretKey);
+            result = authV5( version+"/"+interfaceName, request, dxhyInterfaceRequest,secretKey);
             long end1 = System.currentTimeMillis();
             log.debug("{}鉴权耗时{}毫秒", LOGGER_MSG, end1 - begin1);
             if (!ConfigurerInfo.SUCCSSCODE.equals(result.getCode())) {
@@ -294,14 +296,15 @@ public class InterfaceController extends AbstractController {
         return result;
     }
 
-    private CheckResult authV5(HttpServletRequest request, DxhyInterfaceRequest dxhyInterfaceRequest,String secretKey) {
+    private CheckResult authV5(String url,HttpServletRequest request, DxhyInterfaceRequest dxhyInterfaceRequest,String secretKey) {
         CheckResult checkResult = new CheckResult(RespStatusEnum.AUTHFAIL);
         String reqUrl = request.getRequestURL().toString();
         if (reqUrl.contains(ConfigureConstant.STRING_WH)) {
             reqUrl = reqUrl.substring(ConfigureConstant.INT_0, reqUrl.indexOf(ConfigureConstant.STRING_WH));
         }
+        log.debug("{}请求路径:{}", LOGGER_MSG, reqUrl);
         //获取鉴权URL
-        String signUrl = getAuthUrl(reqUrl, request.getMethod());
+        String signUrl = ipUrl+url+"?";
         TreeMap<String, String> sortMap = new TreeMap<>();
         sortMap.put(ConfigurerInfo.SECRETID, dxhyInterfaceRequest.getSecretId());
         sortMap.put(ConfigurerInfo.DATA_EXCHANGE_ID, dxhyInterfaceRequest.getDataExchangeId());
@@ -383,7 +386,7 @@ public class InterfaceController extends AbstractController {
         }
         return method + reqUrl + "?";
     }
-    
+
     private CheckResult checkInterfaceParamV5(String interfaceVersion, String interfaceName, String secretId, String dataExchangeId, String signature, String encryptCode, String zipCode, String content) {
 
         log.info("{},数据校验,请求的interfaceVersion:{},interfaceName:{},dataExchangeId:{},secretId:{},signature:{},encryptCode:{},zipCode:{},content:{}", LOGGER_MSG, interfaceVersion, interfaceName, dataExchangeId, secretId, signature, encryptCode, zipCode, content);