From 305e96f2cde79d9f5077b2b1feb9f618ee8ff7e2 Mon Sep 17 00:00:00 2001 From: duanyuqing <1697807853@qq.com> Date: Tue, 29 Jul 2025 12:01:03 +0800 Subject: [PATCH] =?UTF-8?q?Date:2025-07-29=20author:Duanyuqing=20comment:?= =?UTF-8?q?=E6=B1=87=E4=BB=98=E5=B7=A5=E5=85=B7=E5=8C=85=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hake-dependencies/pom.xml | 1269 +++++++++-------- .../hake-module-pay-server/pom.xml | 7 + .../src/main/resources/application-dev.yaml | 2 +- .../hake-module-system-server/pom.xml | 8 + .../server/controller/DefaultController.java | 14 +- pom.xml | 1 + 6 files changed, 663 insertions(+), 638 deletions(-) diff --git a/hake-dependencies/pom.xml b/hake-dependencies/pom.xml index 2cf6efa..b2a5e3f 100644 --- a/hake-dependencies/pom.xml +++ b/hake-dependencies/pom.xml @@ -87,639 +87,648 @@ 4.7.5.B 1.2.13 + 3.0.28 - - - - io.netty - netty-bom - ${netty.version} - pom - import - - - org.springframework - spring-framework-bom - ${spring.framework.version} - pom - import - - - org.springframework.security - spring-security-bom - ${spring.security.version} - pom - import - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring.cloud.alibaba.version} - pom - import - - - - - io.github.mouzt - bizlog-sdk - ${bizlog-sdk.version} - - - org.springframework.boot - spring-boot-starter - - - - - cn.iocoder.cloud - hake-spring-boot-starter-biz-tenant - ${revision} - - - cn.iocoder.cloud - hake-spring-boot-starter-biz-data-permission - ${revision} - - - cn.iocoder.cloud - hake-spring-boot-starter-biz-ip - ${revision} - - - - - - org.springframework.boot - spring-boot-configuration-processor - ${spring.boot.version} - - - - cn.iocoder.cloud - hake-spring-boot-starter-env - ${revision} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-web - ${revision} - - - - cn.iocoder.cloud - hake-spring-boot-starter-security - ${revision} - - - - cn.iocoder.cloud - hake-spring-boot-starter-websocket - ${revision} - - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - - - com.github.xiaoymin - knife4j-openapi3-spring-boot-starter - ${knife4j.version} - - - com.github.xiaoymin - knife4j-gateway-spring-boot-starter - ${knife4j.version} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-mybatis - ${revision} - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-jsqlparser-4.9 - ${mybatis-plus.version} - - - com.baomidou - mybatis-plus-generator - ${mybatis-plus.version} - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} - - - com.github.yulichang - mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} - - - - cn.iocoder.cloud - hake-spring-boot-starter-redis - ${revision} - - - - com.fhs-opensource - easy-trans-spring-boot-starter - ${easy-trans.version} - - - org.springframework - spring-context - - - org.springframework.cloud - spring-cloud-commons - - - - - com.fhs-opensource - easy-trans-mybatis-plus-extend - ${easy-trans.version} - - - com.fhs-opensource - easy-trans-anno - ${easy-trans.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.springframework.boot - spring-boot-starter-actuator - - - org.redisson - - redisson-spring-data-34 - - - - - org.redisson - redisson-spring-data-27 - ${redisson.version} - - - - com.dameng - DmJdbcDriver18 - ${dm8.jdbc.version} - - - - org.opengauss - opengauss-jdbc - ${opengauss.jdbc.version} - - - - cn.com.kingbase - kingbase8 - ${kingbase.jdbc.version} - - - - com.taosdata.jdbc - taos-jdbcdriver - ${taos.version} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-rpc - ${revision} - - - - - - - - - com.xuxueli - xxl-job-core - ${xxl-job.version} - - - cn.iocoder.cloud - hake-spring-boot-starter-job - ${revision} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-mq - ${revision} - - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring.version} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-protection - ${revision} - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - - - - - - cn.iocoder.cloud - hake-spring-boot-starter-monitor - ${revision} - - - - org.apache.skywalking - apm-toolkit-trace - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-logback-1.x - ${skywalking.version} - - - org.apache.skywalking - apm-toolkit-opentracing - ${skywalking.version} - - - - - - - - - - - - - io.opentracing - opentracing-api - ${opentracing.version} - - - io.opentracing - opentracing-util - ${opentracing.version} - - - io.opentracing - opentracing-noop - ${opentracing.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - cn.iocoder.cloud - hake-spring-boot-starter-test - ${revision} - test - - - - org.mockito - mockito-inline - ${mockito-inline.version} - - - - org.springframework.boot - spring-boot-starter-test - ${spring.boot.version} - - - asm - org.ow2.asm - - - org.mockito - mockito-core - - - - - - com.github.fppt - jedis-mock - ${jedis-mock.version} - - - - uk.co.jemos.podam - podam - ${podam.version} - - - - - org.flowable - flowable-spring-boot-starter-process - ${flowable.version} - - - org.flowable - flowable-spring-boot-starter-actuator - ${flowable.version} - - - - - - cn.iocoder.cloud - hake-common - ${revision} - - - - cn.iocoder.cloud - hake-spring-boot-starter-excel - ${revision} - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - - cn.hutool - hutool-all - ${hutool.version} - - - - com.alibaba - easyexcel - ${easyexcel.version} - - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.commons - commons-compress - ${commons-compress.version} - - - - org.apache.tika - tika-core - ${tika-core.version} - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - com.google.guava - guava - ${guava.version} - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - commons-net - commons-net - ${commons-net.version} - - - com.jcraft - jsch - ${jsch.version} - - - - com.anji-plus - captcha-spring-boot-starter - ${anji-plus-captcha.version} - - - - org.lionsoul - ip2region - ${ip2region.version} - - - - org.jsoup - jsoup - ${jsoup.version} - - - - org.reflections - reflections - ${reflections.version} - - - - - software.amazon.awssdk - s3 - ${awssdk.version} - - - - com.github.binarywang - weixin-java-pay - ${weixin-java.version} - - - com.github.binarywang - wx-java-mp-spring-boot-starter - ${weixin-java.version} - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - ${weixin-java.version} - - - - me.zhyd.oauth - JustAuth - ${justauth.version} - - - com.xkcoding.justauth - justauth-spring-boot-starter - ${justauth-starter.version} - - - - - org.jeecgframework.jimureport - jimureport-spring-boot-starter - ${jimureport.version} - - - org.jeecgframework.jimureport - jimubi-spring-boot-starter - ${jimureport.version} - - - com.github.jsqlparser - jsqlparser - - - - - - - org.pf4j - pf4j-spring - ${pf4j-spring.version} - - - org.slf4j - slf4j-log4j12 - - - - - - - io.vertx - vertx-core - ${vertx.version} - - - io.vertx - vertx-web - ${vertx.version} - - - io.vertx - vertx-mqtt - ${vertx.version} - - - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - + + + + + com.huifu.bspay.sdk + dg-java-sdk + ${huifu} + + + + + io.netty + netty-bom + ${netty.version} + pom + import + + + org.springframework + spring-framework-bom + ${spring.framework.version} + pom + import + + + org.springframework.security + spring-security-bom + ${spring.security.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + + + + + io.github.mouzt + bizlog-sdk + ${bizlog-sdk.version} + + + org.springframework.boot + spring-boot-starter + + + + + cn.iocoder.cloud + hake-spring-boot-starter-biz-tenant + ${revision} + + + cn.iocoder.cloud + hake-spring-boot-starter-biz-data-permission + ${revision} + + + cn.iocoder.cloud + hake-spring-boot-starter-biz-ip + ${revision} + + + + + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + + + + cn.iocoder.cloud + hake-spring-boot-starter-env + ${revision} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-web + ${revision} + + + + cn.iocoder.cloud + hake-spring-boot-starter-security + ${revision} + + + + cn.iocoder.cloud + hake-spring-boot-starter-websocket + ${revision} + + + + org.springdoc + springdoc-openapi-ui + ${springdoc.version} + + + com.github.xiaoymin + knife4j-openapi3-spring-boot-starter + ${knife4j.version} + + + com.github.xiaoymin + knife4j-gateway-spring-boot-starter + ${knife4j.version} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-mybatis + ${revision} + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + org.mybatis + mybatis + ${mybatis.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-jsqlparser-4.9 + ${mybatis-plus.version} + + + com.baomidou + mybatis-plus-generator + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + com.github.yulichang + mybatis-plus-join-boot-starter + ${mybatis-plus-join.version} + + + + cn.iocoder.cloud + hake-spring-boot-starter-redis + ${revision} + + + + com.fhs-opensource + easy-trans-spring-boot-starter + ${easy-trans.version} + + + org.springframework + spring-context + + + org.springframework.cloud + spring-cloud-commons + + + + + com.fhs-opensource + easy-trans-mybatis-plus-extend + ${easy-trans.version} + + + com.fhs-opensource + easy-trans-anno + ${easy-trans.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + org.springframework.boot + spring-boot-starter-actuator + + + org.redisson + + redisson-spring-data-34 + + + + + org.redisson + redisson-spring-data-27 + ${redisson.version} + + + + com.dameng + DmJdbcDriver18 + ${dm8.jdbc.version} + + + + org.opengauss + opengauss-jdbc + ${opengauss.jdbc.version} + + + + cn.com.kingbase + kingbase8 + ${kingbase.jdbc.version} + + + + com.taosdata.jdbc + taos-jdbcdriver + ${taos.version} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-rpc + ${revision} + + + + + + + + + com.xuxueli + xxl-job-core + ${xxl-job.version} + + + cn.iocoder.cloud + hake-spring-boot-starter-job + ${revision} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-mq + ${revision} + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq-spring.version} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-protection + ${revision} + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + + + + + + cn.iocoder.cloud + hake-spring-boot-starter-monitor + ${revision} + + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-opentracing + ${skywalking.version} + + + + + + + + + + + + + io.opentracing + opentracing-api + ${opentracing.version} + + + io.opentracing + opentracing-util + ${opentracing.version} + + + io.opentracing + opentracing-noop + ${opentracing.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + + cn.iocoder.cloud + hake-spring-boot-starter-test + ${revision} + test + + + + org.mockito + mockito-inline + ${mockito-inline.version} + + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + + + asm + org.ow2.asm + + + org.mockito + mockito-core + + + + + + com.github.fppt + jedis-mock + ${jedis-mock.version} + + + + uk.co.jemos.podam + podam + ${podam.version} + + + + + org.flowable + flowable-spring-boot-starter-process + ${flowable.version} + + + org.flowable + flowable-spring-boot-starter-actuator + ${flowable.version} + + + + + + cn.iocoder.cloud + hake-common + ${revision} + + + + cn.iocoder.cloud + hake-spring-boot-starter-excel + ${revision} + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + + commons-io + commons-io + ${commons-io.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + + + + org.apache.tika + tika-core + ${tika-core.version} + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + com.google.guava + guava + ${guava.version} + + + + com.alibaba + transmittable-thread-local + ${transmittable-thread-local.version} + + + + commons-net + commons-net + ${commons-net.version} + + + com.jcraft + jsch + ${jsch.version} + + + + com.anji-plus + captcha-spring-boot-starter + ${anji-plus-captcha.version} + + + + org.lionsoul + ip2region + ${ip2region.version} + + + + org.jsoup + jsoup + ${jsoup.version} + + + + org.reflections + reflections + ${reflections.version} + + + + + software.amazon.awssdk + s3 + ${awssdk.version} + + + + com.github.binarywang + weixin-java-pay + ${weixin-java.version} + + + com.github.binarywang + wx-java-mp-spring-boot-starter + ${weixin-java.version} + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + ${weixin-java.version} + + + + me.zhyd.oauth + JustAuth + ${justauth.version} + + + com.xkcoding.justauth + justauth-spring-boot-starter + ${justauth-starter.version} + + + + + org.jeecgframework.jimureport + jimureport-spring-boot-starter + ${jimureport.version} + + + org.jeecgframework.jimureport + jimubi-spring-boot-starter + ${jimureport.version} + + + com.github.jsqlparser + jsqlparser + + + + + + + org.pf4j + pf4j-spring + ${pf4j-spring.version} + + + org.slf4j + slf4j-log4j12 + + + + + + + io.vertx + vertx-core + ${vertx.version} + + + io.vertx + vertx-web + ${vertx.version} + + + io.vertx + vertx-mqtt + ${vertx.version} + + + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + diff --git a/hake-module-pay/hake-module-pay-server/pom.xml b/hake-module-pay/hake-module-pay-server/pom.xml index d43905e..a1f2099 100644 --- a/hake-module-pay/hake-module-pay-server/pom.xml +++ b/hake-module-pay/hake-module-pay-server/pom.xml @@ -119,6 +119,13 @@ weixin-java-pay + + + com.huifu.bspay.sdk + dg-java-sdk + ${huifu} + + diff --git a/hake-module-pay/hake-module-pay-server/src/main/resources/application-dev.yaml b/hake-module-pay/hake-module-pay-server/src/main/resources/application-dev.yaml index 2e8c49d..4087431 100644 --- a/hake-module-pay/hake-module-pay-server/src/main/resources/application-dev.yaml +++ b/hake-module-pay/hake-module-pay-server/src/main/resources/application-dev.yaml @@ -115,4 +115,4 @@ hake: order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址 transfer-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/transfer # 支付渠道的【转账】回调地址 - demo: true # 关闭演示模式 + demo: false # 关闭演示模式 diff --git a/hake-module-system/hake-module-system-server/pom.xml b/hake-module-system/hake-module-system-server/pom.xml index e971bd8..7b16f02 100644 --- a/hake-module-system/hake-module-system-server/pom.xml +++ b/hake-module-system/hake-module-system-server/pom.xml @@ -18,6 +18,14 @@ + + + + com.huifu.bspay.sdk + dg-java-sdk + ${huifu} + + cn.iocoder.cloud diff --git a/hake-server/src/main/java/cn/iocoder/hake/server/controller/DefaultController.java b/hake-server/src/main/java/cn/iocoder/hake/server/controller/DefaultController.java index 2b1c1ab..de920a1 100644 --- a/hake-server/src/main/java/cn/iocoder/hake/server/controller/DefaultController.java +++ b/hake-server/src/main/java/cn/iocoder/hake/server/controller/DefaultController.java @@ -24,13 +24,13 @@ public class DefaultController { @RequestMapping("/admin-api/bpm/**") public CommonResult bpm404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[工作流模块 hake-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]"); + "[工作流模块 hake-module-bpm - 已禁用]"); } @RequestMapping("/admin-api/mp/**") public CommonResult mp404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[微信公众号 hake-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]"); + "[微信公众号 hake-module-mp - 已禁用]"); } @RequestMapping(value = { "/admin-api/product/**", // 商品中心 @@ -38,31 +38,31 @@ public class DefaultController { "/admin-api/promotion/**" }) // 营销中心 public CommonResult mall404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[商城系统 hake-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]"); + "[商城系统 hake-module-mall - 已禁用]"); } @RequestMapping("/admin-api/erp/**") public CommonResult erp404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[ERP 模块 hake-module-erp - 已禁用][参考 https://doc.iocoder.cn/erp/build/ 开启]"); + "[ERP 模块 hake-module-erp - 已禁用]"); } @RequestMapping("/admin-api/crm/**") public CommonResult crm404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[CRM 模块 hake-module-crm - 已禁用][参考 https://doc.iocoder.cn/crm/build/ 开启]"); + "[CRM 模块 hake-module-crm - 已禁用]"); } @RequestMapping(value = { "/admin-api/report/**"}) public CommonResult report404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[报表模块 hake-module-report - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]"); + "[报表模块 hake-module-report - 已禁用]"); } @RequestMapping(value = { "/admin-api/pay/**"}) public CommonResult pay404() { return CommonResult.error(NOT_IMPLEMENTED.getCode(), - "[支付模块 hake-module-pay - 已禁用][参考 https://doc.iocoder.cn/pay/build/ 开启]"); + "[支付模块 hake-module-pay - 已禁用]"); } /** diff --git a/pom.xml b/pom.xml index 7a01740..aa78125 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 2.7.18 1.6.3 UTF-8 + 3.0.28