diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java index 0406ff75..30c92447 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java @@ -138,6 +138,8 @@ public class OverallConstant { //中台地址 prodOverAll.put("u8c_url", "http://127.0.0.1:8081/kangarooDataCenterV3/entranceController/externalCallInterface"); + //测试 +// prodOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"); // prodOverAll.put("u8c_url", "http://ufidahz.com.cn:9067/kangarooDataCenterV3/entranceController/externalCallInterface"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 8a0ab7cd..3bd80a02 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -224,6 +224,54 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(startTime, "查询条件，开始时间不能为空！"); Assert.notNull(endTime, "查询条件，结束时间不能为空！"); +// CalculateDateVo calculateDateVo = DateStrUtil.calculateCalculateEntireDayPeriod(dateStr); + String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); + + List headerDetailsDtoList = new ArrayList<>(); + QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); +// queryOfsSoSaleOutVo.setShipAt_start(calculateDateVo.getStart_time()); +// queryOfsSoSaleOutVo.setShipAt_end(calculateDateVo.getEnd_time()); + queryOfsSoSaleOutVo.setShipAt_start(startTime); + queryOfsSoSaleOutVo.setShipAt_end(endTime); + queryOfsSoSaleOutVo.setClientCode("LETS"); + queryOfsSoSaleOutVo.setInternalInstructionType("SALES,EXCHANGE,REISSUE"); + queryOfsSoSaleOutVo.setStatus(900L); + queryOfsSoSaleOutVo.setPageNo(1L); + queryOfsSoSaleOutVo.setPageSize(100L); + queryOfsSoSaleOutVo.setStoreCode(tobShop); +// queryOfsSoSaleOutVo.setCode("LETS-SH2024070500000003"); + ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); + logger.info("数据返回行数：{}", headerDetailsDtoList.size()); + if (headerDetailsDtoList.size() > 0) { + getSetStock(headerDetailsDtoList); + } else { + logger.info("TOC没有查询到任何数据！不需要同步"); + } + + long endMillis = System.currentTimeMillis(); + String threadNameStrEnd = StrUtil.format("结束 OFS销售出库(TOC)同步U8C销售订单 结束 开始时间：{} 结束时间：{} 耗时：{}", startTime, endTime, (endMillis - startMillis)); + logger.info(threadNameStrEnd); + } catch (Exception e) { + logger.error("startImplementStockByTime方法抛出异常", e); + } + } + + /** + * 库存同步，按指定时间拉取 + * + * @param startTime O出库开始时间 + * @param endTime O出库结束时间 + * @author liuyang + */ + public void startImplementStockByTimeAndTran(String startTime, String endTime) throws Exception { + try { + long startMillis = System.currentTimeMillis(); + String threadNameStrStart = StrUtil.format("开始 OFS销售出库(TOC)同步U8C销售订单 开始 开始时间：{} 结束时间：{}", startTime, endTime); + logger.info(threadNameStrStart); + + Assert.notNull(startTime, "查询条件，开始时间不能为空！"); + Assert.notNull(endTime, "查询条件，结束时间不能为空！"); + // CalculateDateVo calculateDateVo = DateStrUtil.calculateCalculateEntireDayPeriod(dateStr); String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); @@ -2344,7 +2392,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //以50行为一个批次，推送到Mysql if (tocofsSaleoutDetailedEntityList.size() > 0) { - List> splitListByCount = SplitListByCountUtil.splitListByCount(tocofsSaleoutDetailedEntityList, 50); + List> splitListByCount = SplitListByCountUtil.splitListByCount(tocofsSaleoutDetailedEntityList, 200); for (int i = 0; i < splitListByCount.size(); i++) { List tocofsSaleoutDetailedEntityList1 = splitListByCount.get(i); iTocofsSaleoutDetailedDao.entityInsertOrUpdateBatchStock3(tocofsSaleoutDetailedEntityList1); @@ -2398,7 +2446,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { //以50行为一个批次，推送到Mysql if (tocofsSaleoutDetailedEntityList.size() > 0) { - List> splitListByCount = SplitListByCountUtil.splitListByCount(tocofsSaleoutDetailedEntityList, 50); + List> splitListByCount = SplitListByCountUtil.splitListByCount(tocofsSaleoutDetailedEntityList, 200); for (int i = 0; i < splitListByCount.size(); i++) { List tocofsSaleoutDetailedEntityList1 = splitListByCount.get(i); iTocofsSaleoutDetailedDao.entityInsertOrUpdateBatchStock4(tocofsSaleoutDetailedEntityList1); diff --git a/buildpackage/src/main/resources/application-ax.yml b/buildpackage/src/main/resources/application-ax.yml deleted file mode 100644 index fda31564..00000000 --- a/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/buildpackage/src/main/resources/application-dev.yml b/buildpackage/src/main/resources/application-dev.yml deleted file mode 100644 index 5e9c4b36..00000000 --- a/buildpackage/src/main/resources/application-dev.yml +++ /dev/null @@ -1,42 +0,0 @@ -#######################dev环境####################### -logging: - #日志级别 指定目录级别 - level: - root: warn - 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 -# path: D:\webservice\file -# pluginpath: D:\webservice\plugin - pluginpath: /home/webservice/zt/plugin -# tomcatpath: D:\apache-tomcat-9.0.69\webapps\kangarooDataCenter\WEB-INF\classes\ - tomcatpath: /home/webservice/zt/tomcatV3/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:9082/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml deleted file mode 100644 index 1ec327da..00000000 --- a/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/buildpackage/src/main/resources/application-lets.yml b/buildpackage/src/main/resources/application-lets.yml index 14b6f02b..a5fb8ed7 100644 --- a/buildpackage/src/main/resources/application-lets.yml +++ b/buildpackage/src/main/resources/application-lets.yml @@ -12,7 +12,7 @@ spring: 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=3000000000&socketTimeout=3000000000&autoReconnectForPools=true + url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true username: root password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 diff --git a/buildpackage/src/main/resources/application-letsprod.yml b/buildpackage/src/main/resources/application-letsprod.yml index 86c52386..12c417ec 100644 --- a/buildpackage/src/main/resources/application-letsprod.yml +++ b/buildpackage/src/main/resources/application-letsprod.yml @@ -12,7 +12,7 @@ spring: dynamic: datasource: master: - url: jdbc:mysql://192.168.14.252:3306/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000000000&socketTimeout=30000000000&autoReconnectForPools=true + url: jdbc:mysql://192.168.14.252:3306/businesscenter?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=600000000&socketTimeout=600000000&autoReconnectForPools=true&keepAlive=true username: root password: 62e4295b615a30dbf3b8ee96f41c820b driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 diff --git a/buildpackage/src/main/resources/application-llg.yml b/buildpackage/src/main/resources/application-llg.yml deleted file mode 100644 index 5953ca0d..00000000 --- a/buildpackage/src/main/resources/application-llg.yml +++ /dev/null @@ -1,62 +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:9999/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 \ No newline at end of file diff --git a/buildpackage/src/main/resources/application-local.yml b/buildpackage/src/main/resources/application-local.yml deleted file mode 100644 index 6c031d2c..00000000 --- a/buildpackage/src/main/resources/application-local.yml +++ /dev/null @@ -1,25 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: /Users/apple/Desktop/log/local -spring: - datasource: - dynamic: - datasource: - master: - url: jdbc:mysql://192.168.14.252: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: /Users/apple/Desktop/log/local - - -zt: - url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/buildpackage/src/main/resources/application-xel.yml b/buildpackage/src/main/resources/application-xel.yml deleted file mode 100644 index e53ca4c4..00000000 --- a/buildpackage/src/main/resources/application-xel.yml +++ /dev/null @@ -1,35 +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: 62e4295b615a30dbf3b8ee96f41c820b - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 -savefile: - # 文件保存路径 - path: /Users/xiangerlin/work/app/file/dev -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 - #电子回单下载临时存放位置 - elec_path: /Users/xiangerlin/Downloads/ -OA: - data_source_code: yc-test diff --git a/buildpackage/src/main/resources/application-yc.yml b/buildpackage/src/main/resources/application-yc.yml deleted file mode 100644 index b2e3e2cf..00000000 --- a/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/buildpackage/src/main/resources/application-ydc.yml b/buildpackage/src/main/resources/application-ydc.yml deleted file mode 100644 index 3038dda0..00000000 --- a/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/buildpackage/src/main/resources/application-yuecheng.yml b/buildpackage/src/main/resources/application-yuecheng.yml deleted file mode 100644 index 7e081ecb..00000000 --- a/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/buildpackage/src/main/resources/application-yuqh.yml b/buildpackage/src/main/resources/application-yuqh.yml deleted file mode 100644 index d114d224..00000000 --- a/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/buildpackage/src/main/resources/application-zqtlocal.yml b/buildpackage/src/main/resources/application-zqtlocal.yml deleted file mode 100644 index 3f1d773b..00000000 --- a/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:9999/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/buildpackage/src/main/resources/application.yml b/buildpackage/src/main/resources/application.yml index 5e8187ff..cd510979 100644 --- a/buildpackage/src/main/resources/application.yml +++ b/buildpackage/src/main/resources/application.yml @@ -36,7 +36,7 @@ spring: # use-suffix-pattern: true profiles: # active: @profileActive@ - active: lets + active: letsprod # active: @profile.active@ # active: dev servlet: @@ -52,12 +52,12 @@ spring: primary: master #设置默认的数据源或者数据源组,默认值即为master strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 druid: - initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时 + initial-size: 50 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时 min-idle: 100 # 最小连接池数量 - maxActive: 1000 # 最大连接池数量 + maxActive: 1200 # 最大连接池数量 maxWait: 600000000 # 获取连接时最大等待时间，单位毫秒。配置了maxWait之后，缺省启用公平锁，并发效率会有所下降，如果需要可以通过配置 - timeBetweenEvictionRunsMillis: 600000 # 关闭空闲连接的检测时间间隔.Destroy线程会检测连接的间隔时间，如果连接空闲时间大于等于minEvictableIdleTimeMillis则关闭物理连接。 - minEvictableIdleTimeMillis: 3000000 # 连接的最小生存时间.连接保持空闲而不被驱逐的最小时间 + timeBetweenEvictionRunsMillis: 60000 # 关闭空闲连接的检测时间间隔.Destroy线程会检测连接的间隔时间，如果连接空闲时间大于等于minEvictableIdleTimeMillis则关闭物理连接。 + minEvictableIdleTimeMillis: 300000 # 连接的最小生存时间.连接保持空闲而不被驱逐的最小时间 validationQuery: SELECT 1 FROM DUAL # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL testWhileIdle: true # 申请连接时检测空闲时间，根据空闲时间再检测连接是否有效.建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRun testOnBorrow: false # 申请连接时直接检测连接是否有效.申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index b200b870..f1f2c6d0 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -97,8 +97,10 @@ class SoSaleOutPluginInitializerToCTest { try { // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-10-18 00:00:00", "2024-10-18 23:59:59"); - String code = "LETS-SH2024102100026682"; + String code = "LETS-SH2024052100015139"; soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran"); + +// soSaleOutPluginInitializerToC.startImplementStockByTimeAndTran("2024-10-22 00:00:00", "2024-10-22 23:59:59"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index 16b7d471..dcdadc30 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -40,7 +40,7 @@ public class SoSaleReturnPluginInitializerToCTest { try { - soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-10-18 00:00:00", "2024-10-18 23:59:59"); + soSaleReturnPluginInitializerToC.startImplementStockByTime("2024-10-21 00:00:00", "2024-10-21 23:59:59"); } catch (Exception e) { e.printStackTrace(); }