detailList = settlement.getTradeSettleOrderDetailArr();
+
+ if (detailList != null) {
+ detailList.forEach(detail -> {
+ detail.setPullData(pullData);
+ detail.setCurrentNumber(sizeStr);
+ });
+ }
+
+ // 为根文档的保存做准备（例如设置ID）
+ settlement.prepareForSave();
+ });
+
+ mongoTemplate.insert(jsonRootBeanSalesSettlementList, JsonRootBeanSalesSettlement.class);
+ } catch (Exception e) {
+ logger.error("batchSaveToMongoDB方法抛出异常", e);
+ throw new RuntimeException(e);
+ }
+ long endTime = System.currentTimeMillis();
+ logger.info("mongodb批量保存耗时:{} 行数：{}", endTime - startTime, jsonRootBeanSalesSettlementList.size());
+ }
+ }
+
+ /**
+ * 根据审核时间范围查询结算单
+ *
+ * 注意：此方法依赖于 auditTime 字段的字符串格式是可按字典序排序的（如 'YYYY-MM-DD HH:mm:ss'）。
+ * 为了保证查询性能，请务必在 tradeSettleOrder.auditTime 字段上创建索引。
+ *
+ * @param auditTimeBegin 审核开始时间, 格式应为 'YYYY-MM-DD HH:mm:ss'
+ * @param auditTimeEnd 审核结束时间, 格式应为 'YYYY-MM-DD HH:mm:ss'
+ * @return 查询到的结算单列表
+ * @author liuyang
+ */
+ public List findSettlementsByAuditTimeRange(String auditTimeBegin, String auditTimeEnd) {
+ logger.info("开始根据审核时间范围查询结算单，开始时间: {}, 结束时间: {}", auditTimeBegin, auditTimeEnd);
+ long startTime = System.currentTimeMillis();
+
+ try {
+ Assert.notNull(auditTimeBegin, "auditTimeBegin不能为空");
+ Assert.notNull(auditTimeEnd, "auditTimeEnd不能为空");
+
+ //创建 Query 对象，用于封装所有查询条件
+ Query query = new Query();
+
+ //构建查询条件 (Criteria)
+ // - 使用点"."符号来访问内嵌文档 'tradeSettleOrder' 的 'auditTime' 字段
+ // - gte: Greater Than or Equal (大于等于 >=)
+ // - lte: Less Than or Equal (小于等于 <=)
+ Criteria criteria = Criteria.where("tradeSettleOrder.auditTime").gte(auditTimeBegin).lte(auditTimeEnd);
+ query.addCriteria(criteria);// 将构建好的条件添加到 Query 对象中
+ List resultList = mongoTemplate.find(query, JsonRootBeanSalesSettlement.class); //使用 MongoTemplate 执行查询
+
+ long endTime = System.currentTimeMillis();
+ logger.info("根据审核时间范围查询完成，耗时: {}ms, 查询到数据: {} 行", endTime - startTime, resultList.size());
+
+ return resultList;
+ } catch (Exception e) {
+ logger.error("findSettlementsByAuditTimeRange方法抛出异常", e);
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 过滤成功数据
+ *
+ * @author liuyang
+ */
+ public List filterSuccessfulData(List jsonRootBeanSalesSettlementList) {
+ List jsonRootBeanSalesSettlementList3 = new ArrayList<>();
+ try {
+ List jsonRootBeanSalesSettlementList2 = new ArrayList<>();
+
+ List> lists = SplitListByCountUtil.splitListByCount(jsonRootBeanSalesSettlementList, 5000);
+ for (int i = 0; i < lists.size(); i++) {
+ List jsonRootBeanSalesSettlementList1 = lists.get(i);
+
+ String[] idArray = jsonRootBeanSalesSettlementList1.stream().map(JsonRootBeanSalesSettlement::getId).map(Object::toString).toArray(String[]::new);
+ List settlementStateById = findSettlementStateById(idArray);
+ jsonRootBeanSalesSettlementList2.addAll(settlementStateById);
+ }
+
+ if (jsonRootBeanSalesSettlementList2.size() > 0) {
+ jsonRootBeanSalesSettlementList3 = filterFailedOrUnreleasedDataRows(jsonRootBeanSalesSettlementList, jsonRootBeanSalesSettlementList2);
+ }
+ } catch (Exception e) {
+ logger.error("filterSuccessfulData方法抛出异常", e);
+ throw new RuntimeException(e);
+ }
+ return jsonRootBeanSalesSettlementList3;
+ }
+
+ /**
+ * 筛选出失败或未推送的数据行
+ *
+ * @param jsonRootBeanSalesSettlementList 通过接口查询出来的数据
+ * @param jsonRootBeanSalesSettlementList2 底表的历史记录
+ * @author liuyang
+ */
+ public List filterFailedOrUnreleasedDataRows(List jsonRootBeanSalesSettlementList, List jsonRootBeanSalesSettlementList2) {
+ List targetJsonRootBeanSalesSettlement = new ArrayList<>();
+
+ if (jsonRootBeanSalesSettlementList != null && jsonRootBeanSalesSettlementList.size() > 0) {
+ List tradeSettleOrderDetailArrAll = new ArrayList<>();
+ for (int i = 0; i < jsonRootBeanSalesSettlementList2.size(); i++) {
+ JsonRootBeanSalesSettlement jsonRootBeanSalesSettlement = jsonRootBeanSalesSettlementList2.get(i);
+ if (jsonRootBeanSalesSettlement.getTradeSettleOrderDetailArr() != null) {
+ List tradeSettleOrderDetailArr = jsonRootBeanSalesSettlement.getTradeSettleOrderDetailArr();
+ tradeSettleOrderDetailArrAll.addAll(tradeSettleOrderDetailArr);
+ }
+ }
+
+ List resultList = tradeSettleOrderDetailArrAll.stream().map(obj -> {
+ if (obj.getNewState() == null) {
+ obj.setNewState("");
+ }
+ return obj;
+ }).collect(Collectors.toList());
+
+ Map no2NameMap = resultList.stream().collect(Collectors.toMap(TradeSettleOrderDetailArrSalesSettlement::getId, TradeSettleOrderDetailArrSalesSettlement::getNewState));
+ String succeseeY = "Y";
+ String succeseeH = "H";
+
+ for (int i = 0; i < jsonRootBeanSalesSettlementList.size(); i++) {
+ JsonRootBeanSalesSettlement jsonRootBeanSalesSettlement = jsonRootBeanSalesSettlementList.get(i);
+ List tradeSettleOrderDetailArr = jsonRootBeanSalesSettlement.getTradeSettleOrderDetailArr();
+ if (tradeSettleOrderDetailArr != null) {
+
+ List targetDetails = new ArrayList<>();
+ for (int j = 0; j < tradeSettleOrderDetailArr.size(); j++) {
+ TradeSettleOrderDetailArrSalesSettlement tradeSettleOrderDetailArrSalesSettlement = tradeSettleOrderDetailArr.get(j);
+
+ boolean isSuccess = false;
+ String newstate = no2NameMap.get(tradeSettleOrderDetailArrSalesSettlement.getId());
+ if (newstate != null && !"".equals(newstate) && (succeseeY.equals(newstate) || succeseeH.equals(newstate))) {
+ isSuccess = true;
+ }
+ if (!isSuccess) {
+ tradeSettleOrderDetailArrSalesSettlement.setNewState(newstate);
+ targetDetails.add(tradeSettleOrderDetailArrSalesSettlement);
+ }
+ }
+
+ if (targetDetails.size() > 0) {
+ //如果明细行中，还存在未推送或者失败的数据，则需要更新明细行
+ jsonRootBeanSalesSettlement.setTradeSettleOrderDetailArr(targetDetails);
+ targetJsonRootBeanSalesSettlement.add(jsonRootBeanSalesSettlement);
+ }
+ }
+ }
+ }
+
+ return targetJsonRootBeanSalesSettlement;
+ }
+
+ /**
+ * 根据id查询结算单
+ */
+ private List findSettlementStateById(String[] idList) {
+ List jsonRootBeanSalesSettlementList1 = new ArrayList<>();
+ try {
+ Query query = new Query();
+
+ //构建查询条件
+ //主键在 MongoDB 中存储的字段名固定为 "_id"
+ //.in() 方法接收一个 Collection (如 List) 或数组，构建 { "_id": { "$in": [...] } } 查询
+ Criteria criteria = Criteria.where("_id").in(idList);
+ //将条件添加到 Query 对象
+ query.addCriteria(criteria);
+ //执行查询并返回结果
+ jsonRootBeanSalesSettlementList1 = mongoTemplate.find(query, JsonRootBeanSalesSettlement.class);
+ } catch (Exception e) {
+ logger.error("findSettlementStateById方法抛出异常", e);
+ throw new RuntimeException(e);
+ }
+ return jsonRootBeanSalesSettlementList1;
+ }
+}
\ No newline at end of file
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/SplitListByCountUtil.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/SplitListByCountUtil.java
new file mode 100644
index 00000000..c847012b
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/SplitListByCountUtil.java
@@ -0,0 +1,38 @@
+package com.hzya.frame.plugin.zanhuo.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.split
+ * @Project：kangarooDataCenterV3
+ * @name：SplitListByCountUtil
+ * @Date：2024/8/2 14:20
+ * @Filename：SplitListByCountUtil
+ */
+public class SplitListByCountUtil {
+ /**
+ * List集合拆分
+ *
+ * @param list 原始数据 6000
+ * @param count 每个list的元素数量 1000
+ * @return 拆分得到的list集合
+ */
+ public static List> splitListByCount(List list, int count) {
+ List> listAll = new ArrayList<>();
+ int size = list.size();
+ if (size > count) { //*size:6000 > count: 1000
+ int absInt = Math.abs(size / count); //6
+ if (size - absInt * count > 0) {
+ listAll.add(list.subList(absInt * count, size));
+ }
+ for (int i = 1; i < absInt + 1; i++) {
+ listAll.add(list.subList((i - 1) * count, i * count));
+ }
+ } else {
+ listAll.add(list);
+ }
+ return listAll;
+ }
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/JackYunApiUtil.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/JackYunApiUtil.java
new file mode 100644
index 00000000..0bc7c261
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/JackYunApiUtil.java
@@ -0,0 +1,94 @@
+package com.hzya.frame.plugin.zanhuo.util.jackyun;
+
+import com.alibaba.fastjson.JSON;
+import com.hzya.frame.plugin.zanhuo.constant.JackYunConstant;
+import com.hzya.frame.plugin.zanhuo.dto.jackyun.ResultDataDto;
+import com.hzya.frame.plugin.zanhuo.jackyun.JackyunApi;
+import okhttp3.*;
+import com.alibaba.fastjson.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.zanhuo.util.jackyun
+ * @Project：kangarooDataCenterV3
+ * @name：JackYunApiUtil
+ * @Date：2025/8/28 15:28
+ * @Filename：JackYunApiUtil
+ */
+public class JackYunApiUtil {
+
+ static Logger logger = LoggerFactory.getLogger(JackYunApiUtil.class);
+
+ private static final DateTimeFormatter DATETIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ private volatile static OkHttpClient httpClient;
+
+ static {
+ httpClient = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).readTimeout(60, TimeUnit.SECONDS).build();
+ }
+
+ /**
+ * 调用 JackYun API 的通用方法
+ *
+ * @param bizData 业务数据
+ * @param method API 方法名
+ * @param typeRef 类型引用，用于精确指定泛型 T 的具体类型
+ * @param 泛型参数，代表 data 列表中的元素类型
+ * @return 携带正确数据类型的 ResultDataDto 对象
+ * @throws IOException
+ * @throws NoSuchAlgorithmException
+ */
+ public static ResultDataDto callJackYunApi(String bizData, String method, TypeReference> typeRef) throws IOException, NoSuchAlgorithmException {
+ SortedMap sortedMap = new TreeMap<>();
+ sortedMap.put("method", method);
+ sortedMap.put("appkey", JackYunConstant.jackyum_appKey);
+ sortedMap.put("version", JackYunConstant.jackyum_version);
+ sortedMap.put("contenttype", "json");
+ sortedMap.put("timestamp", DATETIME_FORMATTER.format(LocalDateTime.now()));
+ sortedMap.put("bizcontent", bizData);
+
+ StringBuilder sbSignData = new StringBuilder(JackYunConstant.jackyum_appSecret);
+ for (Map.Entry entry : sortedMap.entrySet()) {
+ sbSignData.append(entry.getKey()).append(entry.getValue());
+ }
+ sbSignData.append(JackYunConstant.jackyum_appSecret);
+
+ sortedMap.put("sign", Md5EncryptUtil.md5Encrypt(sbSignData.toString().toLowerCase()));
+
+ FormBody.Builder formBodyBuilder = new FormBody.Builder();
+ for (Map.Entry entry : sortedMap.entrySet()) {
+ formBodyBuilder.add(entry.getKey(), entry.getValue());
+ }
+ RequestBody formBody = formBodyBuilder.build();
+
+ Request request = new Request.Builder().url(JackYunConstant.jackyum_api).post(formBody).build();
+
+ logger.info("开始 调用吉客云接口：{} method:{}", JackYunConstant.jackyum_api, method);
+ long startTime = System.currentTimeMillis();
+ try (Response response = httpClient.newCall(request).execute()) {
+ if (!response.isSuccessful()) {
+ String errorBody = response.body() != null ? response.body().string() : "null";
+ throw new IOException("非预期的HTTP响应码: " + response.code() + ", 响应体: " + errorBody);
+ }
+ if (response.body() == null) {
+ return null;
+ }
+ String responseBodyString = response.body().string();
+ long endTime = System.currentTimeMillis();
+ logger.info("结束 调用吉客云接口：{} method:{} 耗时：{}毫秒 {}秒", JackYunConstant.jackyum_api, method, (endTime - startTime), ((endTime - startTime) / 1000));
+ //可以打断点
+ return JSON.parseObject(responseBodyString, typeRef);
+ }
+ }
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/Md5EncryptUtil.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/Md5EncryptUtil.java
new file mode 100644
index 00000000..706490e8
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/zanhuo/util/jackyun/Md5EncryptUtil.java
@@ -0,0 +1,30 @@
+package com.hzya.frame.plugin.zanhuo.util.jackyun;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.zanhuo.util.jackyun
+ * @Project：kangarooDataCenterV3
+ * @name：Md5EncryptUtil
+ * @Date：2025/8/28 15:28
+ * @Filename：Md5EncryptUtil
+ */
+public class Md5EncryptUtil {
+ public static String md5Encrypt(String text) throws NoSuchAlgorithmException {
+ MessageDigest md5 = MessageDigest.getInstance("MD5");
+ byte[] resultByte = text.getBytes(StandardCharsets.UTF_8);
+ byte[] md5Bytes = md5.digest(resultByte);
+ StringBuilder hexValue = new StringBuilder();
+ for (byte md5Byte : md5Bytes) {
+ int val = (md5Byte) & 0xff;
+ if (val < 16) {
+ hexValue.append("0");
+ }
+ hexValue.append(Integer.toHexString(val));
+ }
+ return hexValue.toString();
+ }
+}
diff --git a/base-buildpackage/src/main/resources/application-ax.yml b/base-buildpackage/src/main/resources/application-ax.yml
deleted file mode 100644
index fda31564..00000000
--- a/base-buildpackage/src/main/resources/application-ax.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#######################澳星环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: GBK
- file:
-# 日志保存路径
- path: E:\yongansystem\log
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://127.0.0.1:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: E:\yongansystem\file
-zt:
- url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface
\ No newline at end of file
diff --git a/base-buildpackage/src/main/resources/application-dev.yml b/base-buildpackage/src/main/resources/application-dev.yml
index 5e9c4b36..cfd73c23 100644
--- a/base-buildpackage/src/main/resources/application-dev.yml
+++ b/base-buildpackage/src/main/resources/application-dev.yml
@@ -2,23 +2,26 @@
logging:
#日志级别 指定目录级别
level:
- root: warn
+ root: info
encodings: UTF-8
file:
# 日志保存路径
- path: /home/webservice/zt/log
+ path: /Users/liuyang/workspaces/hzya/zanhuoproject/kangarooDataCenterV3/ztlog
spring:
datasource:
dynamic:
datasource:
master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+ url: jdbc:mysql://192.168.99.4:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
+ password: da51213c6d9d6a7f7c364a3d1a71345f
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+ data:
+ mongodb:
+ uri: mongodb://businesscenter:Hzya%401314@192.168.99.4:27017/businesscenter?authSource=admin&connectTimeoutMS=10000&socketTimeoutMS=15000&wtimeoutMS=15000
savefile:
# 文件保存路径
- path: /home/webservice/zt/file
+ path: /Users/liuyang/workspaces/hzya/zanhuoproject/kangarooDataCenterV3/ztfile
# path: D:\webservice\file
# pluginpath: D:\webservice\plugin
pluginpath: /home/webservice/zt/plugin
diff --git a/base-buildpackage/src/main/resources/application-hclocal.yml b/base-buildpackage/src/main/resources/application-hclocal.yml
deleted file mode 100644
index 1ec327da..00000000
--- a/base-buildpackage/src/main/resources/application-hclocal.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: D:\yongansystem\kangarooDataCenter\v3\logs
-spring:
- datasource:
- dynamic:
- datasource:
- master:
-# url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-# username: root
-# password: bd993088e8a7c3dc5f44441617f9b4bf
-# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: D:\yongansystem\kangarooDataCenter\v3\logs
-zt:
- url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
diff --git a/base-buildpackage/src/main/resources/application-llg.yml b/base-buildpackage/src/main/resources/application-llg.yml
deleted file mode 100644
index 11273505..00000000
--- a/base-buildpackage/src/main/resources/application-llg.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
- # 日志保存路径
- path: /Users/apple/Desktop/log/local
-spring:
- data:
- mongodb:
-# host: 192.168.2.237
-# port: 27017
-# database: businesscenter
-# auto-index-creation: true
-# password: hzya1314
-# username: hzya
- 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
-# type: com.alibaba.druid.pool.DruidDataSource
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-# url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-# 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: /Users/apple/Desktop/log/local
- tomcatpath: /Users/apple/Desktop/log/local
- pluginpath: /Users/apple/Desktop/log/local
-zt:
- url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
-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
-server:
- port: 10086
-
-# mysqldump -d mylm -hhzya.ufyct.com -p9096 -uroot -phzya1314 >%dirName%\table_view.sql
-
-
-database:
- databaseName: businesscenter
- host: 192.168.2.237
- port: 3306
- username: root
- password: hzya@1314
- filePase: /Users/apple/Desktop/log
- fileName: data.sql
-#sftp:
-# host: 192.168.2.237
-# port: 9091
-# username: cs237
-# password: hzya@1314
-# filePase: /databaseBack
diff --git a/base-buildpackage/src/main/resources/application-local.yml b/base-buildpackage/src/main/resources/application-local.yml
deleted file mode 100644
index 66d151f2..00000000
--- a/base-buildpackage/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: /Users/apple/Desktop/log/local
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: /Users/apple/Desktop/log/local
-zt:
- url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
diff --git a/base-buildpackage/src/main/resources/application-xel.yml b/base-buildpackage/src/main/resources/application-xel.yml
deleted file mode 100644
index e5d2197f..00000000
--- a/base-buildpackage/src/main/resources/application-xel.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: /Users/xiangerlin/work/app/logs/dev
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: bd993088e8a7c3dc5f44441617f9b4bf
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: /Users/xiangerlin/work/app/file/dev
- pluginpath: /Users/xiangerlin/work/app/file/dev
- tomcatpath: /Users/xiangerlin/work/app/file/dev
diff --git a/base-buildpackage/src/main/resources/application-yc.yml b/base-buildpackage/src/main/resources/application-yc.yml
deleted file mode 100644
index b2e3e2cf..00000000
--- a/base-buildpackage/src/main/resources/application-yc.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-#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
-#logging:
-# #日志级别 指定目录级别warn
-# level:
-# root: info
-# encodings: UTF-8
-# file:
-# # 日志保存路径
-# path: /home/webservice/zt/log
-#spring:
-# datasource:
-# dynamic:
-# datasource:
-# master:
-# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-# username: root
-# password: 62e4295b615a30dbf3b8ee96f41c820b
-# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-#savefile:
-# # 文件保存路径
-# path: /home/webservice/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://ufidahz.com.cn: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
- 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: /zt/elecfile
-OA:
- data_source_code: yc_oa
diff --git a/base-buildpackage/src/main/resources/application-ydc.yml b/base-buildpackage/src/main/resources/application-ydc.yml
deleted file mode 100644
index 3038dda0..00000000
--- a/base-buildpackage/src/main/resources/application-ydc.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: /Users/xiangerlin/work/app/logs/ydc
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: bd993088e8a7c3dc5f44441617f9b4bf
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: /Users/xiangerlin/work/app/logs/ydc
diff --git a/base-buildpackage/src/main/resources/application-yuecheng.yml b/base-buildpackage/src/main/resources/application-yuecheng.yml
deleted file mode 100644
index 7e081ecb..00000000
--- a/base-buildpackage/src/main/resources/application-yuecheng.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: /Users/xiangerlin/work/app/logs/yuecheng
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: /Users/xiangerlin/work/app/logs/yuecheng
-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: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
diff --git a/base-buildpackage/src/main/resources/application-yuqh.yml b/base-buildpackage/src/main/resources/application-yuqh.yml
deleted file mode 100644
index d114d224..00000000
--- a/base-buildpackage/src/main/resources/application-yuqh.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#######################本地环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
-# 日志保存路径
- path: E:\yongansystem\log
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: bd993088e8a7c3dc5f44441617f9b4bf
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: E:\yongansystem\log
-zt:
- url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
diff --git a/base-buildpackage/src/main/resources/application-zqtlocal.yml b/base-buildpackage/src/main/resources/application-zqtlocal.yml
deleted file mode 100644
index 5aeac683..00000000
--- a/base-buildpackage/src/main/resources/application-zqtlocal.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-#######################zqtlocal环境#######################
-logging:
- #日志级别 指定目录级别
- level:
- root: info
- encodings: UTF-8
- file:
- # 日志保存路径
- path: D:/local/logs/
-spring:
- datasource:
- dynamic:
- datasource:
- master:
- url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
- username: root
- password: 62e4295b615a30dbf3b8ee96f41c820b
- driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-savefile:
- # 文件保存路径
- path: D:/local/upload/
- pluginpath : D:/local/plugin/
- tomcatpath: E:\apache-tomcat-9.0.27\webapps\kangarooDataCenterV3\WEB-INF\classes\
-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
-zt:
- url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface
\ No newline at end of file
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/pluginCfg.xml
similarity index 61%
rename from base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml
rename to base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/pluginCfg.xml
index e9adf11a..af5db26d 100644
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml
+++ b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/pluginCfg.xml
@@ -1,6 +1,6 @@
-MdmPlugin
-MdmPlugin插件
+SoSalePlugin
+SoSalePlugin插件
90000001
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-dao.xml
similarity index 95%
rename from base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml
rename to base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-dao.xml
index f857d7fc..ad72735e 100644
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-dao.xml
+++ b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-dao.xml
@@ -1,4 +1,5 @@
-
+
+
\ No newline at end of file
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-plugin.xml
similarity index 65%
rename from base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml
rename to base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-plugin.xml
index 471dd4a6..04f6ac64 100644
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml
+++ b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-plugin.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-service.xml
similarity index 61%
rename from base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml
rename to base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-service.xml
index c642948f..ad72735e 100644
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml
+++ b/base-buildpackage/src/main/resources/cfgHome/cfgHome/plugin/lets/spring/spring-zanhuo-service.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/pluginCfg.xml
deleted file mode 100644
index 774971d0..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-BackUpDatabasePlugin
-BackUpDatabasePlugin插件
-20241021
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index 29896996..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/BackUpDatabase/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index 6943ad23..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml
deleted file mode 100644
index 7b7b63b8..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-MdmModulePlugin
-MdmModulePlugin插件
-90000001
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index 4952fc4c..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/mdmDistribute/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml
deleted file mode 100644
index 00d5dc0b..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-SysMessageManageLogPlugin
-SysMessageManageLogPlugin插件
-202403080010
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index 2ca55124..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml
deleted file mode 100644
index 4f0c39ab..00000000
--- a/base-buildpackage/src/main/resources/cfgHome/plugin/sysMessageManageLogBack/spring/spring-buildpackage-service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar b/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar
deleted file mode 100644
index eac564c0..00000000
Binary files a/base-buildpackage/src/main/webapp/WEB-INF/lib/openapi-sdk-1.0.0.jar and /dev/null differ
diff --git a/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar b/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar
deleted file mode 100644
index e8fb256e..00000000
Binary files a/base-buildpackage/src/main/webapp/WEB-INF/lib/taobao-sdk-java-auto-1.1.jar and /dev/null differ
diff --git a/base-buildpackage/src/test/java/com/hzya/frame/plugin/zanhuo/sale/TocSalesSettlementTest.java b/base-buildpackage/src/test/java/com/hzya/frame/plugin/zanhuo/sale/TocSalesSettlementTest.java
new file mode 100644
index 00000000..ce5d660d
--- /dev/null
+++ b/base-buildpackage/src/test/java/com/hzya/frame/plugin/zanhuo/sale/TocSalesSettlementTest.java
@@ -0,0 +1,76 @@
+package com.hzya.frame.plugin.zanhuo.sale;
+
+import com.hzya.frame.WebappApplication;
+import com.hzya.frame.plugin.zanhuo.dto.jackyun.datadto.salessettlement.JsonRootBeanSalesSettlement;
+import com.hzya.frame.plugin.zanhuo.jackyun.JackyunApi;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.zanhuo.sale
+ * @Project：kangarooDataCenterV3
+ * @name：TocSalesSettlementTest
+ * @Date：2025/8/28 16:57
+ * @Filename：TocSalesSettlementTest
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WebappApplication.class)
+public class TocSalesSettlementTest {
+
+ @Autowired
+ private TocSalesSettlement tocSalesSettlement;
+
+ @Autowired
+ private JackyunApi jackyunApi;
+
+// @Test
+// public void testQueryJackYumSalesSettlement() {
+// try {
+// TocSalesSettlement tocSalesSettlement = new TocSalesSettlement();
+// tocSalesSettlement.queryJackYumSalesSettlement("2025-08-27 00:00:00", "2025-08-27 23:59:59");
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+
+ @Test
+ public void testQueryJackYumSalesSettlement() {
+ try {
+
+// Map paramsMap = new HashMap<>();
+// paramsMap.put("auditTimeBegin", "2025-08-28 00:00:00");
+// paramsMap.put("auditTimeEnd", "2025-08-28 23:59:59");
+//
+// jackyunApi.queryJackYumSalesSettlement(paramsMap,0L);
+
+// Map paramsMap = new HashMap<>();
+// paramsMap.put("settleNo", "XSJS2025082924332");
+
+// List jsonRootBeanSalesSettlementList = jackyunApi.queryJackYumSalesSettlement(paramsMap, 0L);
+// System.out.println(jsonRootBeanSalesSettlementList.size());
+
+ tocSalesSettlement.queryjackYumSalesSettlementByTime("2025-08-28 00:00:00", "2025-08-28 23:59:59");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testFindSettlementsByAuditTimeRange() {
+ try {
+ tocSalesSettlement.findSettlementsByAuditTimeRange("2025-08-28 00:00:00", "2025-08-28 23:59:59");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
index 825925b0..f8c114e8 100644
--- a/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
+++ b/base-buildpackage/src/test/java/com/hzya/frame/temButtom.java
@@ -36,7 +36,7 @@ public class temButtom {
@Test
public void test01() {
- String a = AESUtil.encrypt("hzya@1314");
+ String a = AESUtil.encrypt("Hzya@1314");
System.out.println(a);
String b = AESUtil.decrypt("62e4295b615a30dbf3b8ee96f41c820b");
System.out.println(b);
diff --git a/pom.xml b/pom.xml
index 857e7f56..141ce6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,33 +477,33 @@
maven-war-plugin
-
- ${basedir}/../base-service/src/main/webapp/WEB-INF/lib
- WEB-INF/lib/
- false
-
-
- **/*.jar
-
-
-
- ${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib
- WEB-INF/lib/
- false
-
-
- **/*.jar
-
-
-
- ${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib
- WEB-INF/lib/
- false
-
-
- **/*.jar
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+