From 2b5588c1544b776db1ce0db8c12ec5b5b3a145b5 Mon Sep 17 00:00:00 2001 From: Jermaine Date: Mon, 10 Mar 2025 13:58:44 +0800 Subject: [PATCH] releases 2 production --- .../src/main/resources/bootstrap.bck.properties | 15 +++++++++++---- .../batch/tasklet/sign/Fdd01ContractTasklet.java | 11 +++++------ .../zkj/loan/batch/tasklet/sign/JobRequest.java | 3 ++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/loan-parent/loan-batch-boot/src/main/resources/bootstrap.bck.properties b/loan-parent/loan-batch-boot/src/main/resources/bootstrap.bck.properties index 2faaa2b..a75a212 100644 --- a/loan-parent/loan-batch-boot/src/main/resources/bootstrap.bck.properties +++ b/loan-parent/loan-batch-boot/src/main/resources/bootstrap.bck.properties @@ -1,10 +1,11 @@ server.port=8090 spring.application.name=loan-batch +#spring.profiles.active=sit spring.profiles.active=sit -spring.cloud.nacos.config.server-addr=10.99.67.59:8848 -spring.cloud.nacos.config.username=gwb -spring.cloud.nacos.config.password=2jeauyCu6Yhu -spring.cloud.nacos.config.namespace=gwb-sit +spring.cloud.nacos.config.namespace=cc-dev-feature +spring.cloud.nacos.config.server-addr=47.119.166.103:8848 +spring.cloud.nacos.config.username=nacos +spring.cloud.nacos.config.password=PwBCrYhX6JfKNTi spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.discovery.server-addr=${spring.cloud.nacos.config.server-addr} spring.cloud.nacos.discovery.username=${spring.cloud.nacos.config.username} @@ -14,3 +15,9 @@ spring.cloud.nacos.discovery.service=${spring.application.name} spring.main.allow-bean-definition-overriding=true server.servlet.session.cookie.http-only=true +#server.tongWeb.license.type=file +#server.tongWeb.license.path=classpath:tongweb/license.dat +#server.tongWeb.uri-encoding=utf-8 +#server.tongWeb.max-threads=800 +logging.level.com.zkj.rcs.sys.mapper=debug +knife4j.basic.enable=true \ No newline at end of file diff --git a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/Fdd01ContractTasklet.java b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/Fdd01ContractTasklet.java index 7b1eac9..290975b 100644 --- a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/Fdd01ContractTasklet.java +++ b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/Fdd01ContractTasklet.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; import static com.zkj.loan.batch.constants.JobStatusCode.*; /** - * @Description: 什邡村行客户信息到信贷文件 + * @Description: 签章跑批任务 * @Author: ziming.ni * @Date: 2024/11/29 */ @@ -77,7 +77,7 @@ public class Fdd01ContractTasklet extends AbstractBatchTasklet { JSONObject jsonObject = JSONObject.parseObject(e.getData()); String filePath = jsonObject.getString("filePath"); // 需要删除 - filePath = filePath.replace("/home/nas/contract/20250304/23021313383194dnriajv7enSHNSBANK/", "E:\\IdeaProjects\\cc\\rcs-sys\\loan-parent\\aTree\\contract\\"); + // filePath = filePath.replace("/home/nas/contract/20250304/23021313383194dnriajv7enSHNSBANK/", "E:\\IdeaProjects\\cc\\rcs-sys\\loan-parent\\aTree\\contract\\"); FileEntity fileEntity = new FileEntity(); fileEntity.setFilePath(filePath); fileEntity.setContractId(e.getId()); @@ -123,10 +123,9 @@ public class Fdd01ContractTasklet extends AbstractBatchTasklet { String singedUrl = signFdd.getString("download_url"); jsonObject.put("signedUrl", singedUrl); - String path = "E:\\IdeaProjects\\cc\\rcs-sys\\loan-parent\\aTree\\signContract"; - downloadUrl(bizDate, path, singedUrl, e); - jsonObject.put("signedPath", StrUtil.join(File.separator, "/home/nas/signContract", bizDate, e.getBizNo(), e.getBizNo() + "_" + e.getBizFileType() + ".pdf")); - // downloadUrl(bizDate, signedPath, singedUrl); + // String path = "E:\\IdeaProjects\\cc\\rcs-sys\\loan-parent\\aTree\\signContract"; + downloadUrl(bizDate, signedPath, singedUrl, e); + jsonObject.put("signedPath", StrUtil.join(File.separator, signedPath, bizDate, e.getBizNo(), e.getBizNo() + "_" + e.getBizFileType() + ".pdf")); e.setData(JSON.toJSONString(jsonObject)); e.setBizType(ContractConst.FILE_SIGNED); diff --git a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/JobRequest.java b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/JobRequest.java index 90f779f..f1e044e 100644 --- a/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/JobRequest.java +++ b/loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/JobRequest.java @@ -55,7 +55,8 @@ public class JobRequest { @ApiModelProperty("本地保存ok文件名包含路径") private String uploadOkFileFullName; @ApiModelProperty("本地保存路径") - private String signedPath = "E:\\IdeaProjects\\cchx\\rcs-sys\\loan-parent\\aTest"; + // private String signedPath = "E:\\IdeaProjects\\cchx\\rcs-sys\\loan-parent\\aTest"; + private String signedPath = "/home/nas/signContract"; @ApiModelProperty("本地保存文件名包含路径-临时文件路径") private String saveFileFullName; @ApiModelProperty("产品编码")