From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/api/common/PublicController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/api/common/PublicController.java b/server/service/src/main/java/com/doumee/api/common/PublicController.java
index 93429dc..7c7015a 100644
--- a/server/service/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/service/src/main/java/com/doumee/api/common/PublicController.java
@@ -4,16 +4,23 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
import com.doumee.core.utils.aliyun.ProgressModel;
+import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.service.business.InsuranceApplyService;
+import com.doumee.service.business.InterfaceLogService;
+import com.jzq.common.bean.sign.NotifyDataReq;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +34,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* @author Eva.Caesar Liu
@@ -46,6 +50,49 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private InsuranceApplyService insuranceApplyService;
+
+ @Autowired
+ public InterfaceLogService interfaceLogService = null;
+
+ @ApiOperation("鍚涘瓙绛剧绾﹀洖璋冮�氱煡")
+ @PostMapping("/signNotify")
+ public void updateStatus(@RequestParam Map<String,String> req, HttpServletResponse response) {
+ Map<String, Object> context = new HashMap<>();
+ context.put("success",true);
+ InterfaceLog log=new InterfaceLog();
+ log.setType(1);
+ log.setCreateDate(new Date());
+ log.setIsdeleted(0);
+ log.setRequest(JSONObject.toJSONString(req));
+ log.setName("鍚涘瓙绛剧绾﹀洖璋冮�氱煡");
+ log.setUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode());
+ try {
+ String appKey = systemDictDataBiz.queryByCode(Constants.SIGN,Constants.SIGN_APPKEY).getCode();
+ String appSecret = systemDictDataBiz.queryByCode(Constants.SIGN,Constants.SIGN_APPSECRET).getCode();
+ if(!StringUtils.equals(appKey,req.get("appkey"))){
+ throw new BusinessException(com.doumee.core.constants.ResponseStatus.BAD_REQUEST.getCode(),"appkey涓嶅尮閰�");
+ }
+ String sign = DigestUtils.sha1Hex("data"+ req.get("data")+"method"+req.get("method")+"version"+req.get("version")+"timestamp"+req.get("timestamp")
+ +"appKey"+appKey+"appSecret"+appSecret);
+ if(!StringUtils.equals(sign,req.get("sign"))){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"楠岀涓嶉�氳繃");
+ }
+ NotifyDataReq data = JSONObject.parseObject(req.get("data"), NotifyDataReq.class);
+ String r = insuranceApplyService.dealSignResult(data);
+ log.setRepose(r);
+ }catch (Exception e){
+ log.setRepose("澶勭悊寮傚父锛�"+e.getMessage());
+ context.put("success",false);
+ context.put("msg","澶勭悊鍙戠敓寮傚父");
+ throw e;
+ }finally {
+ interfaceLogService.create(log);
+ }
+ writerJson(response, context);
+ }
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
@@ -340,4 +387,5 @@
writerJson(response, context);
return;
}
+
}
--
Gitblit v1.9.3