hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'yuecheng-project' of http://hzya.ufyct.com:9015/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
yuqh 2024-07-08 10:01:03 +08:00
parent 86b2808b9c 13c5c5dab5
commit bcae9c8a05
11 changed files with 189 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java
View File

@ -371,7 +371,7 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
} else {
result.setPayResult(PayState.payStateGetValue(pay_status));//支付状态 支付状态和支付申请状态用一个
}
agentPaymentService.updateResult(result);
//更新明细表
List<AgentPayQueryDTO> agentDetails = agentPayResultResDTO.getAgentDetails();
for (AgentPayQueryDTO d : agentDetails) {
@ -386,6 +386,8 @@ public class CbsPluginServiceImpl implements ICbsPluginService {
detail.setDataSourceCode(oa_data_source_code);
agentPaymentDetailService.updatePayResult(detail);
}
result.setPayDate(CBSUtil.convertTimestampToString(agentDetails.get(0).getDtlPayTime()));
agentPaymentService.updateResult(result);
}
}
return agentPayResultResDTO;

14
buildpackage/src/main/resources/application-dev.yml
View File

@ -19,3 +19,17 @@ spring:
savefile:
# 文件保存路径
path: /home/webservice/zt/file
cbs8:
appId: 1P4AGrpz
appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
url: https://cbs8-openapi-reprd.csuat.cmburl.cn
# 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
# 这个私钥到时候上传到cbs，和下面到是同一对
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
cbs_public_key: 0469146F06BF3B01236E84632441E826
#电子回单下载临时存放位置
elec_path: /Users/xiangerlin/Downloads/
OA:
data_source_code: yc_oa

104
buildpackage/src/main/resources/application-yc.yml
View File

@ -1,28 +1,28 @@
#logging:
# #日志级别 指定目录级别
# level:
# root: info
# encodings: UTF-8
# file:
# # 日志保存路径
# path: /zt/log
#spring:
# flyway:
# # 启动flyway migration, 默认为true
# enabled: false
# datasource:
# dynamic:
# druid:
# filters: stat,log4j2
# datasource:
# master:
# url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
# username: businesscenter
# password: 6842568689469adad597d144ee104063
# driver-class-name: dm.jdbc.driver.DmDriver
#savefile:
# # 文件保存路径
# path: /zt/file
logging:
#日志级别 指定目录级别
level:
root: info
encodings: UTF-8
file:
# 日志保存路径
path: /zt/log
spring:
flyway:
# 启动flyway migration, 默认为true
enabled: false
datasource:
dynamic:
druid:
filters: stat,log4j2
datasource:
master:
url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
username: businesscenter
password: 6842568689469adad597d144ee104063
driver-class-name: dm.jdbc.driver.DmDriver
savefile:
# 文件保存路径
path: /zt/file
#公司mysql
#ax:
# url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
@ -49,31 +49,31 @@
#公司服务器达梦
logging:
#日志级别 指定目录级别
level:
root: info
encodings: UTF-8
file:
# 日志保存路径
path: /zt/log
spring:
flyway:
# 启动flyway migration, 默认为true
enabled: false
datasource:
dynamic:
druid:
filters: stat,log4j2
datasource:
master:
url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
username: hzyazt
password: 62e4295b615a30dbf3b8ee96f41c820b
driver-class-name: dm.jdbc.driver.DmDriver
savefile:
# 文件保存路径
path: /zt/file
#logging:
# #日志级别 指定目录级别
# level:
# root: info
# encodings: UTF-8
# file:
# # 日志保存路径
# path: /zt/log
#spring:
# flyway:
# # 启动flyway migration, 默认为true
# enabled: false
# datasource:
# dynamic:
# druid:
# filters: stat,log4j2
# datasource:
# master:
# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
# username: hzyazt
# password: 62e4295b615a30dbf3b8ee96f41c820b
# driver-class-name: dm.jdbc.driver.DmDriver
#savefile:
# # 文件保存路径
# path: /zt/file
cbs8:
appId: 1P4AGrpz
appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
@ -83,8 +83,8 @@ cbs8:
# 这个私钥到时候上传到cbs，和下面到是同一对
#ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
cbs_public_key: 0469146F06BF3B01236E84632441E826
cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
#电子回单下载临时存放位置
elec_path: /zt/elecfile
OA:
data_source_code: yc_oa
data_source_code: OA

6
service/src/main/java/com/hzya/frame/cbs8/service/ICbs8ExtService.java
View File

@ -28,6 +28,12 @@ public interface ICbs8ExtService {
* @return
*/
SysExtensionApiEntity agentPayApply(SysExtensionApiEntity entity);
/**
* 代发代扣 支付申请 回调方法
* @param logEntity
* @return
*/
void agentPayApplyCallBack(SysMessageManageLogEntity logEntity);
/**
* 交易结果查询

51
service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ExtServiceImpl.java
View File

@ -18,6 +18,7 @@ import com.hzya.frame.web.exception.BaseSystemException;
import org.apache.http.protocol.HTTP;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@ -32,6 +33,7 @@ import java.util.*;
public class Cbs8ExtServiceImpl implements ICbs8ExtService {
Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private IIntegrationTaskLivingDetailsService taskLivingDetailsService;
/**
@ -43,6 +45,7 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
@Override
public SysExtensionApiEntity payApply(SysExtensionApiEntity entity) {
String bodys = entity.getBodys();
logger.info("Cbs8ExtServiceImpl.payApply方法body参数:{}",bodys);
if (StrUtil.isNotEmpty(bodys)) {
PaymentEntity paymentEntity = JSONObject.parseObject(bodys, PaymentEntity.class);
if (null != paymentEntity) {
@ -73,6 +76,7 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
entity.setBodys(requestData);
}
}
logger.info("Cbs8ExtServiceImpl.payApply方法执行完毕:{}",JSONObject.toJSONString(entity));
return entity;
}
@ -136,6 +140,49 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
return entity;
}
/**
* 代发代扣 支付申请 回调方法
*
* @param logEntity
* @return
*/
@Override
public void agentPayApplyCallBack(SysMessageManageLogEntity logEntity) {
try {
logger.info("回调方法里的参数:{}", JSONObject.toJSONString(logEntity));
JSONObject targetData = JSONObject.parseObject(logEntity.getTargetData());//目标数据
JSONObject sourceData = JSONObject.parseObject(logEntity.getSourceData());//源数据
JSONObject sourceHeaders = sourceData.getJSONObject("header");//源header
JSONObject targetHeaders = targetData.getJSONObject("header");//目标header
JSONObject sourceBody = sourceData.getJSONObject("body");//源数据body
//自定义参数，存放的是请求报文明文
String hzyaExtData = targetHeaders.getString("hzyaExtData");
String returnDataBase64 = logEntity.getReturnData();
byte[] secretResByte = Base64.getDecoder().decode(returnDataBase64);
//解密报文
String decryptRes = CBSUtil.decrypt(secretResByte);
//6、记录系统日志
IntegrationTaskLivingDetailsEntity logTask = new IntegrationTaskLivingDetailsEntity();
logTask.setRootAppPk(sourceBody.getString("formsonId"));
logTask.setRootAppBill(sourceBody.getString("referenceNum"));
logTask.setPluginId("CBS8PayApplyAgentPlugin");
//对方接口返回信息
logTask.setNewTransmitInfo(decryptRes);
logTask.setNewPushDate(new Date());
//调用接口请求参数
logTask.setRootAppNewData(hzyaExtData);
PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(decryptRes);
//为true是成功
if (payResponseDTO.getSuccessed()) {
taskLivingDetailsService.saveLogToSuccess(logTask);
}else {
taskLivingDetailsService.saveLogToFail(logTask);
}
} catch (Exception e) {
logger.info("agentPayApplyCallBack方法执行出错:{}",e);
}
}
/**
* 交易结果查询
*
@ -239,11 +286,14 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
* @return
*/
private Map<String, String> headersValueOf(String sign, long timestamp) {
logger.info("开始组装请求头参数:{},{}",sign,timestamp);
Map<String, String> header = new HashMap();
header.put(CBSUtil.SIGN_HEADER_NAME, sign);
header.put(CBSUtil.TIMESTAMP_HEADER, Long.toString(timestamp));
header.put(HTTP.CONTENT_TYPE, CBSUtil.TARGET_CONTENT_TYPE);
logger.info("准备获取token");
header.put(CBSUtil.AUTHORIZATION, CBSUtil.BEARER + CbsAccessToken.getToken());
logger.info("组装后的header参数:{}",JSONObject.toJSONString(header));
return header;
}
@ -264,5 +314,6 @@ public class Cbs8ExtServiceImpl implements ICbs8ExtService {
header.put("hzyaExtData", requestData);
entity.setByteBodys(encryptedData);
entity.setHeaders(header);
logger.info("加密，签名方法执行完毕");
}
}

3
service/src/main/java/com/hzya/frame/cbs8/service/impl/Cbs8ServiceImpl.java
View File

@ -45,6 +45,7 @@ public class Cbs8ServiceImpl implements ICbs8Service {
.put("appId","800026")
.build();
String body = HttpRequest.post("http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterfaceToESB").addHeaders(headerMap).body(JSONObject.toJSONString(paymentEntity)).timeout(60000).execute().body();
logger.info("payApply方法调用externalCallInterfaceToESB返回信息：{}",body);
//解密响应报文
String result = decryptResBody(body);
PayResponseDTO payResponseDTO = PayResponseDTO.payResValueOf(result);
@ -255,9 +256,11 @@ public class Cbs8ServiceImpl implements ICbs8Service {
* @return
*/
private String decryptResBody(String body){
logger.info("准备解密银行返回的报文:{}",body);
if (StrUtil.isNotEmpty(body)){
JsonResultEntity resultEntity = JSONObject.parseObject(body,JsonResultEntity.class);
String bodyBase64 = String.valueOf(resultEntity.getAttribute());
logger.info("base64解码后的参数:{}",bodyBase64);
byte[] bodyBytes = Base64.getDecoder().decode(bodyBase64);
//这里验证一下，如果系统异常 返回的报文没加密
String test = new String(bodyBytes);

6
service/src/main/java/com/hzya/frame/cbs8/util/CBSUtil.java
View File

@ -169,8 +169,14 @@ public class CBSUtil {
* @return
*/
public static byte[] encrypt(String requestData){
logger.info("bodyEncryptionKey: "+bodyEncryptionKey+"requestData: "+ requestData);
try {
byte[] encrypt = SM2Util.encrypt(bodyEncryptionKey, requestData.getBytes(StandardCharsets.UTF_8));
return encrypt;
}catch (Exception e){
logger.error("加密失败",e);
}
return null;
}
public static String decrypt(byte[] cipherData){

48
service/src/main/java/com/hzya/frame/cbs8/util/CbsAccessToken.java
View File

@ -24,22 +24,12 @@ import java.util.Map;
public class CbsAccessToken {
private static final Logger logger = LoggerFactory.getLogger(CbsAccessToken.class);
@Value("${cbs8.appId}")
private String app_id;
@Value("${cbs8.appSecret}")
private String app_secret;
@Value("${cbs8.url}")
private String app_url;
private static String appId;
private static String appSecret;
private static String url;
@PostConstruct
public void init() {
appId = app_id;
appSecret = app_secret;
url = app_url;
}
private static String app_id;
private static String app_secret;
private static String app_url;
//刷新token用
private static final String BEARER = "Bearer ";
/**
@ -52,9 +42,21 @@ public class CbsAccessToken {
}
private static CbsAccessToken cbsAccessToken = new CbsAccessToken();
@Value("${cbs8.appId}")
public void setApp_id(String app_id) {
CbsAccessToken.app_id = app_id;
}
@Value("${cbs8.appSecret}")
public void setApp_secret(String app_secret) {
CbsAccessToken.app_secret = app_secret;
}
@Value("${cbs8.url}")
public void setApp_url(String app_url) {
CbsAccessToken.app_url = app_url;
}
public static CbsAccessToken getInstance() {
logger.info("开始获取token");
if (null == cbsAccessToken.token){
initToken();
}else {
@ -65,6 +67,7 @@ public class CbsAccessToken {
refreshToken();
}
}
logger.info("取到的token:{}",cbsAccessToken.token);
return cbsAccessToken;
}
@ -75,13 +78,14 @@ public class CbsAccessToken {
* 获取token
*/
private static void initToken(){
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
logger.info("开始获取cbstoken");
//CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
Map<String,String> param = new HashMap<>();
param.put("app_id",ct.appId);
param.put("app_secret",ct.appSecret);
param.put("app_id",CbsAccessToken.app_id);
param.put("app_secret",CbsAccessToken.app_secret);
param.put("grant_type","client_credentials");
String res = HttpRequest.post(ct.url+"/openapi/app/v1/app/token").body(JSONObject.toJSONString(param)).execute().body();
logger.info("获取cbstoken请求地址:{},参数:{}",CbsAccessToken.app_url,JSONObject.toJSONString(param));
String res = HttpRequest.post(CbsAccessToken.app_url+"/openapi/app/v1/app/token").body(JSONObject.toJSONString(param)).execute().body();
logger.info("获取cbstoken结果",res);
if (StrUtil.isNotEmpty(res) && JSONUtil.isTypeJSON(res)){
JSONObject tokenObject = JSONObject.parseObject(res);
@ -104,10 +108,10 @@ public class CbsAccessToken {
* 刷新token
*/
private static void refreshToken(){
CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
//CbsAccessToken ct = (CbsAccessToken) ApplicationContextUtil.getBeanByName("cbsAccessToken");
//token不为空，并且没过期 刷新token
if (null != cbsAccessToken.token && System.currentTimeMillis() < cbsAccessToken.expiryTime ){
String res = HttpRequest.get(ct.url + "/openapi/app/v1/app/refresh-token").header("Authorization", BEARER + cbsAccessToken.token).execute().body();
String res = HttpRequest.get(CbsAccessToken.app_url + "/openapi/app/v1/app/refresh-token").header("Authorization", BEARER + cbsAccessToken.token).execute().body();
logger.info("刷新cbstoken结果",res);
if (StrUtil.isNotEmpty(res) && JSONUtil.isTypeJSON(res)){
JSONObject tokenObject = JSONObject.parseObject(res);

11
service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.java
View File

@ -35,7 +35,8 @@ public class AgentPaymentEntity extends BaseEntity {
private String applyCode;
//支付结果
private String payResult;
//支付日期
private String payDate;
private String tableName;//表名称
private String billName;//单据名称
@ -142,4 +143,12 @@ public class AgentPaymentEntity extends BaseEntity {
public void setPayResult(String payResult) {
this.payResult = payResult;
}
public String getPayDate() {
return payDate;
}
public void setPayDate(String payDate) {
this.payDate = payDate;
}
}

1
service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/AgentPaymentEntity.xml
View File

@ -120,6 +120,7 @@
update formmain_0224 set
<trim suffix="" suffixOverrides=",">
<if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>
<if test="payDate != null and payDate !='' ">field0058 =#{payDate},</if>
<if test="payResult != null and payResult !='' ">field0046 =#{payResult}</if>
</trim>
where id = #{oaId}

20
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
View File

@ -2125,16 +2125,18 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
Map<String, String> headers,
String oldquerys, String querys,
String body, boolean flag,String msg) {
logger.info("保存日志开始内部");
SysMessageManageLogEntity sysMessageManageLogEntity = new SysMessageManageLogEntity();
//messageManageId 消息主表主键
//theme 消息主题
//messageCode 消息编码
//sendApp
sysMessageManageLogEntity.setSendApp(sendApp.getId());//发送者应用
sysMessageManageLogEntity.setSendApp(sendApp.getId() != null ? sendApp.getId() : null);//发送者应用
//sendApi 发送者
sysMessageManageLogEntity.setReceiveCode(receiveApi.getApiCode() != null ? receiveApi.getApiCode().toString() : null);//接收者编码
sysMessageManageLogEntity.setReceiveApp(receiveApp.getId());//接收者应用
sysMessageManageLogEntity.setReceiveApi(receiveApi.getId());//接收者
sysMessageManageLogEntity.setReceiveApp(receiveApp.getId() != null ? receiveApp.getId() : null);//接收者应用
sysMessageManageLogEntity.setReceiveApi(receiveApi.getId() != null ? receiveApi.getId() : null);//接收者
JSONObject jsonObject = new JSONObject();
jsonObject.put("body", oldbodys);
jsonObject.put("header", oldheaderMap);
@ -2747,6 +2749,16 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
logger.info("保存日志开始");
try {
Base64.getEncoder().encodeToString(byteBodys);
} catch (Exception e) {
logger.error("byteBodys{}", e.getMessage());
}
try {
Base64.getEncoder().encodeToString(body);
} catch (Exception e) {
logger.error("body{}", e.getMessage());
}
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, Base64.getEncoder().encodeToString(body),true,null);
if (methods != null && methods.length > 0) {
for (Method m : methods) {
@ -2829,6 +2841,8 @@ public class SysApplicationServiceImpl extends BaseService<SysApplicationEntity,
}
logger.info("保存日志开始");
SysMessageManageLogEntity sysMessageManageLogEntity = saveLog(sendApp, receiveApp, receiveApi, oldbodys,Base64.getEncoder().encodeToString(byteBodys) , oldheaderMap,headers, headers, oldquerys,querys, body.toString(), true,null);
logger.info("保存日志结束");
if (methods != null && methods.length > 0) {
for (Method m : methods) {
if (null != m) {