From 217e5b1b32e4f88731b13e6e481744c282869937 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 4 Sep 2023 23:26:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BF=97=E9=82=A6=E6=8E=A5=E5=8F=A3=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81=E6=9B=B4=E6=96=B0=202.test=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/TestService.java | 48 +++++++++++++++++++
 .../ZbFactoryAccountsInterceptor.java         |  4 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 blade-service/logpm-basicdata/src/test/java/com/logpm/basicdata/TestService.java

diff --git a/blade-service/logpm-basicdata/src/test/java/com/logpm/basicdata/TestService.java b/blade-service/logpm-basicdata/src/test/java/com/logpm/basicdata/TestService.java
new file mode 100644
index 000000000..07adf372d
--- /dev/null
+++ b/blade-service/logpm-basicdata/src/test/java/com/logpm/basicdata/TestService.java
@@ -0,0 +1,48 @@
+//package com.logpm.basicdata;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+//import com.logpm.basicdata.service.IBasicdataWarehouseService;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
+//import org.springblade.common.cache.CacheNames;
+//import org.springblade.core.redis.cache.BladeRedis;
+//import org.springblade.core.test.BladeBootTest;
+//import org.springblade.core.test.BladeSpringExtension;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//import java.io.IOException;
+//
+//@ExtendWith(BladeSpringExtension.class)
+//@BladeBootTest(appName = "logpm-basicdata-zhy", enableLoader = true)
+//public class TestService {
+//
+//	@Autowired
+//	private BladeRedis bladeRedis;
+//	@Autowired
+//	private IBasicdataWarehouseService basicdataWarehouseService;
+//
+//
+//	@Test
+//	public void test3() throws IOException {
+//
+//		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseService.getById(1684441029670547458L);
+//
+////		bladeRedis.setEx(CacheNames.tenantKeyObj("627683", CacheNames.USER_WAREHOUSE_KEY, "1649331096967450625"), JSONObject.toJSONString(warehouseEntity), 30 * 24 * 60 * 60L);
+//
+////		Object o = bladeRedis.get("627683:logpm:user:warehouse:select:1649331096967450625");
+//
+//
+////		bladeRedis.setEx(CacheNames.tenantKeyObj("627683111", CacheNames.USER_WAREHOUSE_KEY, "1649331096967450625"), ProtostuffUtil.serialize(warehouseEntity), 30 * 24 * 60 * 60L);
+////		Object o = bladeRedis.get("627683111:logpm:user:warehouse:select:1649331096967450625");
+//
+//		JSONObject jsonObject = new JSONObject();
+//		jsonObject.put("name","xiaob");
+//		jsonObject.put("age",23);
+//
+//		bladeRedis.setEx(CacheNames.tenantKeyObj("627683", CacheNames.USER_WAREHOUSE_KEY, "1649331096967450625"), jsonObject.toJSONString(), 30 * 24 * 60 * 60L);
+//
+//		System.out.println(111);
+//	}
+//
+//}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java
index dcb80599c..48229bdea 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/ZbFactoryAccountsInterceptor.java
@@ -39,6 +39,7 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor {
 
 		String body = myRequestWrapper.getBody();
 		JSONObject bodyJson = JSONObject.parseObject(body);
+		String s1 = bodyJson.toJSONString();
 
 		Map<String, String> params = new HashMap<>();
 		params.put("app_key",appKey);
@@ -49,7 +50,8 @@ public class ZbFactoryAccountsInterceptor implements HandlerInterceptor {
 		params.put("timestamp",timestamp);
 		params.put("v",v);
 
-		String newSign = QmSignUntil.signTopRequest(params, zbFactoryProperties.getSecretkey(), signMethod, bodyJson.toJSONString());
+		String s = body.replaceAll(" +", "");
+		String newSign = QmSignUntil.signTopRequest(params, zbFactoryProperties.getSecretkey(), signMethod, s);
 		if(!newSign.equals(sign)){
 			returnJson(response,JSONObject.toJSONString(R.fail(203,"签名认证失败")));
 			return false;