From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/platform/src/main/java/com/doumee/api/common/PublicController.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/common/PublicController.java b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
index 4904bc8..93a4120 100644
--- a/server/platform/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/platform/src/main/java/com/doumee/api/common/PublicController.java
@@ -1,8 +1,10 @@
package com.doumee.api.common;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelToPdfTool;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -16,6 +18,7 @@
import com.doumee.service.business.InsuranceApplyService;
import com.doumee.service.business.InterfaceLogService;
import com.doumee.service.business.third.SignService;
+import com.jzq.common.bean.sign.NotifyDataReq;
import com.jzq.common.bean.sign.NotifyReq;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,10 +29,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
@@ -39,6 +39,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+import java.lang.reflect.Field;
import java.util.*;
/**
@@ -57,33 +58,31 @@
private InsuranceApplyService insuranceApplyService;
@Autowired
public InterfaceLogService interfaceLogService = null;
-
@ApiOperation("鍚涘瓙绛剧绾﹀洖璋冮�氱煡")
@PostMapping("/signNotify")
- public void updateStatus(@RequestBody NotifyReq request,HttpServletResponse response) {
+ 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(request));
-
+ 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,request.getAppkey())){
+ if(!StringUtils.equals(appKey,req.get("appkey"))){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"appkey涓嶅尮閰�");
}
- String sign = DigestUtils.sha1Hex("data"+JSONObject.toJSONString(request.getData())+"method"+request.getMethod()+"version"+request.getVersion()+"timestamp"+request.getTimestamp()
+ 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,request.getSign())){
+ if(!StringUtils.equals(sign,req.get("sign"))){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"楠岀涓嶉�氳繃");
}
- insuranceApplyService.dealSignResult(request.getData());
+ NotifyDataReq data = JSONObject.parseObject(req.get("data"), NotifyDataReq.class);
+ insuranceApplyService.dealSignResult(data);
}catch (Exception e){
log.setRepose("澶勭悊寮傚父锛�"+e.getMessage());
context.put("success",false);
@@ -92,7 +91,6 @@
}finally {
interfaceLogService.create(log);
}
-
writerJson(response, context);
}
@@ -174,6 +172,17 @@
String tempFileName = nowDate + "/" + fileName;
String key = folder + tempFileName;// 鏂囦欢鍚�
ALiYunUtil obs = new ALiYunUtil(endpoint,access_id, access_key);
+ int type = 2;
+ if(StringUtils.endsWith(key,".mp4")){
+ type =1;
+ }else if(StringUtils.endsWith(key,".jpg")
+ || StringUtils.endsWith(key,".JPG")
+ || StringUtils.endsWith(key,".png")
+ || StringUtils.endsWith(key,".PNG")
+ || StringUtils.endsWith(key,".jpeg")
+ || StringUtils.endsWith(key,".JPEG")){
+ type =0;
+ }
if (obs.uploadOnlineObject(file.getInputStream(),bucketName, key,null)) {
// 绉诲姩鎴愬姛,杩斿洖鏂囦欢鍚�
// sendSuccessMessage(response, resourcePath+key);
@@ -183,6 +192,7 @@
JSONObject fileJSON = new JSONObject();
fileJSON.put("url", resourcePath + key);
fileJSON.put("imgaddr", tempFileName);
+ fileJSON.put("type", type);
fileJSON.put("imgname", fileName);
fileJSON.put("originname", originname);
context.put("data",fileJSON);
--
Gitblit v1.9.3