niziming/rcs-sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.119.166.103:3000/niziming/rcs-sys

Browse Source
This commit is contained in:
15737803739 2025-03-11 14:42:20 +08:00
commit 4e163d3c4c
6 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
loan-parent/libs/knife4j-1.0-SNAPSHOT.jar
View File

Binary file not shown.

BIN
loan-parent/libs/knife4j-1.0.jar
View File

Binary file not shown.

35
loan-parent/loan-batch-boot/Dockerfile
View File

@ -1,27 +1,32 @@
FROM openjdk:11.0.14-jdk
ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Dserver.port=8090 \
# 设置时区和环境变量
ENV TZ=Asia/Shanghai \
JAVA_OPTS="-Dserver.port=8090 \
-Dspring.profiles.active=sit \
-Dspring.cloud.nacos.config.namespace=dx-action-feature \
-Dspring.cloud.nacos.config.server-addr=10.246.8.9:8848 \
-Dspring.cloud.nacos.config.server-addr=172.16.0.98:8848 \
-Dspring.cloud.nacos.config.username=nacos \
-Dspring.cloud.nacos.config.password=nacos \
-Dspring.cloud.nacos.config.password=PwBCrYhX6JfKNTi \
-Dspring.cloud.nacos.discovery.namespace=dx-action-feature \
-Dspring.cloud.nacos.discovery.server-addr=10.246.8.9:8848 \
-Dspring.cloud.nacos.discovery.server-addr=172.16.0.98:8848 \
-Dspring.cloud.nacos.discovery.username=nacos \
-Dspring.cloud.nacos.discovery.password=nacos \
-Dspring.cloud.nacos.discovery.password=PwBCrYhX6JfKNTi \
-Ddruid.mysql.usePingMethod=false \
-Xmx4g -Xms4g -Xmn1g -XX:MetaspaceSize=512m -XX:MaxMetaspaceSize=512m"
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN mkdir -p /batch
RUN mkdir -p /home/rcs
RUN mkdir -p /home/appusr
RUN mkdir -p /upload
VOLUME ["/home/rcs","/upload"]
WORKDIR /batch
EXPOSE 8090
# 设置时区并创建所需目录
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && \
echo $TZ > /etc/timezone && \
mkdir -p /batch /home/rcs /home/appusr /upload /home/nas
# 添加数据卷
VOLUME ["/home/rcs", "/upload", "/home/appusr", "/home/nas"]
# 设置工作目录和暴露端口
WORKDIR /batch
EXPOSE 8090 8100
# 添加应用 JAR 文件并设置启动命令
ADD ./target/loan-batch.jar ./
CMD java $JAVA_OPTS -jar loan-batch.jar
CMD java $JAVA_OPTS -jar loan-batch.jar

15
loan-parent/loan-batch-boot/src/main/resources/bootstrap.bck.properties
View File

@ -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

11
loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/Fdd01ContractTasklet.java
View File

@ -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);

3
loan-parent/loan-batch-internet/loan-batch-internet-application/src/main/java/com/zkj/loan/batch/tasklet/sign/JobRequest.java
View File

@ -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("产品编码")