fix: 福建企赋回调按最新文档调整3

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/GigThirdApiController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.admin.api.dto.OladingCommonRequest;
@@ -27,6 +28,7 @@ import com.qunzhixinxi.hnqz.admin.service.ZhongyiyunInputRecordService;
 import com.qunzhixinxi.hnqz.admin.service.ZhongzhiInputRecordService;
 import com.qunzhixinxi.hnqz.admin.service.gig.GigThirdApiService;
 import com.qunzhixinxi.hnqz.admin.service.gig.OladingInputRecordService;
+import com.qunzhixinxi.hnqz.admin.util.SaasApiDemoV2;
 import com.qunzhixinxi.hnqz.admin.util.ZhongyiyunUtils;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
@@ -150,10 +152,8 @@ public class GigThirdApiController {
 		}
 
 		String decryptDataStr = null;
-		JSONObject newBodyJson = null;
+		com.alibaba.fastjson.JSONObject unPackMessage = null;
 		try {
-			Boolean encryptedState = bodyJson.getBool("encryptedState");
-
 			// 查询deptSub获取desKey
 			SysDeptSub deptSub = sysDeptSubService.getOne(Wrappers.<SysDeptSub>lambdaQuery()
 					.eq(SysDeptSub::getEnableFlag, "1")
@@ -164,20 +164,11 @@ public class GigThirdApiController {
 				return "fail";
 			}
 
-			String desKey = StrUtil.split(deptSub.getAppId(), "|").get(2);
+			String publicKey = deptSub.getRsaPublicKey();
 
-			// 验签 略
-			if (encryptedState) {
-                // 解密data
-                decryptDataStr = ZhongyiyunUtils.decrypt(data, desKey);
-                newBodyJson = JSONUtil.parseObj(decryptDataStr);
-            } else {
-				decryptDataStr = data;
-                newBodyJson = JSONUtil.parseObj(data);
-            }
-			// 解密data
-			decryptDataStr = ZhongyiyunUtils.decrypt(data, desKey);
-			newBodyJson = JSONUtil.parseObj(decryptDataStr);
+			// 验签/解密
+			unPackMessage =
+					SaasApiDemoV2.unPackMessage(JSON.parseObject(body), com.alibaba.fastjson.JSONObject.class, publicKey);
 		} catch (Exception e) {
 			log.error("福建企赋签约回调参数异常", e);
 			return "fail";
@@ -192,7 +183,7 @@ public class GigThirdApiController {
 		}
 
 		// 业务处理
-		gigThirdApiService.qiFuSignNotify(newBodyJson);
+		gigThirdApiService.qiFuSignNotify(unPackMessage);
 
 		return "success";
 	}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/GigThirdApiService.java

@@ -28,7 +28,7 @@ public interface GigThirdApiService {
 	 * @param newBodyJson
 	 * @return
 	 */
-	boolean qiFuSignNotify(JSONObject newBodyJson);
+	boolean qiFuSignNotify(com.alibaba.fastjson.JSONObject newBodyJson);
 
 	/**
 	 * 中智结算回调业务处理

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/GigThirdApiServiceImpl.java

@@ -166,13 +166,13 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	 * @return
 	 */
 	@Override
-	public boolean qiFuSignNotify(JSONObject newBodyJson) {
+	public boolean qiFuSignNotify(com.alibaba.fastjson.JSONObject newBodyJson) {
 
-		String idCard = newBodyJson.getStr("idCard");
-		String mobile = newBodyJson.getStr("mobile");
-		String name = newBodyJson.getStr("name");
-		String state = newBodyJson.getStr("state");
-		String resMsg = newBodyJson.getStr("resMsg");
+		String idCard = newBodyJson.getString("idCard");
+		String mobile = newBodyJson.getString("mobile");
+		String name = newBodyJson.getString("name");
+		String state = newBodyJson.getString("state");
+		String resMsg = newBodyJson.getString("resMsg");
 
 		// 查询当前用户
 		SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery()