diff --git a/README.md b/README.md index acb6158a3..d1e98cedc 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@

star - Build Status + Build Status star - Build Status + Build Status Build Status Downloads diff --git a/dax-pay/pom.xml b/dax-pay/pom.xml index 4f6ca5667..453826e33 100644 --- a/dax-pay/pom.xml +++ b/dax-pay/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-dax-pay - 1.0.1 + 1.0.2 dax-pay @@ -134,8 +134,7 @@ cn.bootx - mybatis-table-modify-mysql-boot-starter - ${mybatis-table-modify.version} + table-modify-mysql-boot-starter @@ -165,6 +164,12 @@ + + + io.minio + minio + 8.5.4 + com.github.javen205 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java index 8d4474fc5..df811dbbb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java @@ -1,10 +1,5 @@ package cn.bootx.platform.daxpay.core.channel.alipay.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbTable; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.bootx.platform.common.core.function.EntityBaseFunction; @@ -13,6 +8,11 @@ import cn.bootx.platform.daxpay.code.paymodel.AliPayCode; import cn.bootx.platform.daxpay.core.channel.alipay.convert.AlipayConvert; import cn.bootx.platform.daxpay.dto.channel.alipay.AlipayConfigDto; import cn.bootx.platform.daxpay.param.channel.alipay.AlipayConfigParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java index 31aa4b8bb..81421d15c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java @@ -1,9 +1,9 @@ package cn.bootx.platform.daxpay.core.channel.base.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.code.pay.PayStatusCode; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java index c5aa29875..fa0c04876 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/config/entity/PayChannelConfig.java @@ -1,11 +1,11 @@ package cn.bootx.platform.daxpay.core.channel.config.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.core.channel.config.convert.PayChannelConfigConvert; import cn.bootx.platform.daxpay.dto.channel.config.PayChannelConfigDto; import cn.bootx.platform.daxpay.param.channel.config.PayChannelConfigParam; +import cn.bootx.table.modify.annotation.DbColumn; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java index 8e6518bfd..7743de48c 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java @@ -1,14 +1,14 @@ package cn.bootx.platform.daxpay.core.channel.voucher.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbComment; -import cn.bootx.mybatis.table.modify.annotation.DbTable; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.code.paymodel.VoucherCode; import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherDto; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbComment; +import cn.bootx.table.modify.annotation.DbTable; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java index f0f956ed2..d39da81c4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java @@ -1,12 +1,12 @@ package cn.bootx.platform.daxpay.core.channel.voucher.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.code.paymodel.VoucherCode; import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherLogDto; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java index f71f76015..64e417567 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java @@ -1,13 +1,13 @@ package cn.bootx.platform.daxpay.core.channel.voucher.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.handler.JacksonRawTypeHandler; import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment; import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert; import cn.bootx.platform.daxpay.dto.channel.voucher.VoucherPaymentDto; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java index a51cebcdb..50445b98d 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java @@ -1,14 +1,14 @@ package cn.bootx.platform.daxpay.core.channel.wallet.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbTable; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlIndexType; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.code.paymodel.WalletCode; import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; import cn.bootx.platform.daxpay.dto.channel.wallet.WalletDto; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlIndexType; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -19,7 +19,8 @@ import lombok.experimental.FieldNameConstants; import java.math.BigDecimal; -import static cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet.Fields.*; +import static cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet.Fields.mchAppCode; +import static cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet.Fields.userId; /** * 钱包 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java index 89a9887cc..971fc3d1a 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletConfig.java @@ -1,13 +1,13 @@ package cn.bootx.platform.daxpay.core.channel.wallet.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbTable; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; import cn.bootx.platform.daxpay.dto.channel.wallet.WalletConfigDto; import cn.bootx.platform.daxpay.param.channel.wechat.WalletConfigParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.annotation.DbTable; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java index 856ade0af..d02743a67 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java @@ -1,11 +1,12 @@ package cn.bootx.platform.daxpay.core.channel.wallet.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; + import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; import cn.bootx.platform.daxpay.dto.channel.wallet.WalletLogDto; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayment.java index 41dcef0a7..51a6f2355 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayment.java @@ -1,6 +1,5 @@ package cn.bootx.platform.daxpay.core.channel.wallet.entity; -import cn.bootx.mybatis.table.modify.annotation.DbTable; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment; import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java index 5bf1fc221..e909030ce 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java @@ -1,9 +1,5 @@ package cn.bootx.platform.daxpay.core.channel.wechat.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.core.annotation.EncryptionField; import cn.bootx.platform.common.core.function.EntityBaseFunction; @@ -12,6 +8,10 @@ import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode; import cn.bootx.platform.daxpay.core.channel.wechat.convert.WeChatConvert; import cn.bootx.platform.daxpay.dto.channel.wechat.WeChatPayConfigDto; import cn.bootx.platform.daxpay.param.channel.wechat.WeChatPayConfigParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java index eda7394c2..15fb74ecb 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java @@ -8,7 +8,6 @@ import cn.bootx.platform.daxpay.core.payment.entity.Payment; import cn.bootx.platform.daxpay.core.refund.local.AsyncRefundLocal; import cn.bootx.platform.daxpay.dto.payment.RefundableInfo; import cn.bootx.platform.daxpay.exception.payment.PayFailureException; -import cn.bootx.platform.starter.file.service.FileUploadService; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -41,8 +40,6 @@ import static cn.bootx.platform.daxpay.code.pay.PayStatusCode.REFUND_PROCESS_FAI @RequiredArgsConstructor public class WeChatPayCancelService { - private final FileUploadService uploadService; - /** * 关闭支付 */ diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java index b4648168a..7929a0e84 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java @@ -1,8 +1,8 @@ package cn.bootx.platform.daxpay.core.merchant.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java index da76b639c..bd4a0cf61 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java @@ -1,14 +1,13 @@ package cn.bootx.platform.daxpay.core.merchant.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.annotation.DbTable; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlIndexType; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.core.merchant.convert.MchApplicationConvert; import cn.bootx.platform.daxpay.dto.merchant.MchApplicationDto; import cn.bootx.platform.daxpay.param.merchant.MchApplicationParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlIndexType; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java index 39743e46d..8eca72282 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java @@ -1,13 +1,13 @@ package cn.bootx.platform.daxpay.core.merchant.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlIndexType; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; import cn.bootx.platform.daxpay.core.merchant.convert.MerchantInfoConvert; import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto; import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlIndexType; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java index b59475c52..6d1b211d4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/notify/entity/PayNotifyRecord.java @@ -1,14 +1,14 @@ package cn.bootx.platform.daxpay.core.notify.entity; -import cn.bootx.mybatis.table.modify.annotation.DbComment; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.code.pay.PayChannelEnum; import cn.bootx.platform.daxpay.code.pay.PayStatusCode; import cn.bootx.platform.daxpay.core.notify.convert.PayNotifyConvert; import cn.bootx.platform.daxpay.dto.notify.PayNotifyRecordDto; +import cn.bootx.table.modify.annotation.DbComment; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java index 5f3d5d395..f4727e610 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/payment/entity/Payment.java @@ -1,10 +1,5 @@ package cn.bootx.platform.daxpay.core.payment.entity; -import cn.bootx.mybatis.table.modify.annotation.DbColumn; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlIndex; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlIndexType; import cn.bootx.platform.common.core.annotation.BigField; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity; @@ -14,6 +9,11 @@ import cn.bootx.platform.daxpay.core.payment.convert.PaymentConvert; import cn.bootx.platform.daxpay.dto.payment.PayChannelInfo; import cn.bootx.platform.daxpay.dto.payment.PaymentDto; import cn.bootx.platform.daxpay.dto.payment.RefundableInfo; +import cn.bootx.table.modify.annotation.DbColumn; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; +import cn.bootx.table.modify.mysql.constants.MySqlIndexType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/record/entity/PaySyncRecord.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/record/entity/PaySyncRecord.java index 24d17dc90..3cb76bdae 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/record/entity/PaySyncRecord.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/sync/record/entity/PaySyncRecord.java @@ -1,14 +1,14 @@ package cn.bootx.platform.daxpay.core.sync.record.entity; -import cn.bootx.mybatis.table.modify.annotation.DbComment; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.function.EntityBaseFunction; import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; import cn.bootx.platform.daxpay.code.pay.PayChannelEnum; import cn.bootx.platform.daxpay.code.pay.PaySyncStatus; import cn.bootx.platform.daxpay.core.sync.record.convert.PaySyncRecordConvert; import cn.bootx.platform.daxpay.dto.sync.PaySyncRecordDto; +import cn.bootx.table.modify.annotation.DbComment; +import cn.bootx.table.modify.mysql.annotation.DbMySqlFieldType; +import cn.bootx.table.modify.mysql.constants.MySqlFieldTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/sync/PaySyncRecordDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/sync/PaySyncRecordDto.java index 37ad764dd..b6dcfa6da 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/sync/PaySyncRecordDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/sync/PaySyncRecordDto.java @@ -1,7 +1,5 @@ package cn.bootx.platform.daxpay.dto.sync; -import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.DbMySqlFieldType; -import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlFieldTypeEnum; import cn.bootx.platform.common.core.rest.dto.BaseDto; import cn.bootx.platform.daxpay.code.pay.PayChannelEnum; import cn.bootx.platform.daxpay.code.pay.PaySyncStatus; @@ -43,7 +41,6 @@ public class PaySyncRecordDto extends BaseDto { private String payChannel; /** 通知消息 */ - @DbMySqlFieldType(MySqlFieldTypeEnum.LONGTEXT) @Schema(description = "通知消息") private String syncInfo; diff --git a/dax-start/pom.xml b/dax-start/pom.xml index 5b7333259..893854c24 100644 --- a/dax-start/pom.xml +++ b/dax-start/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform bootx-dax-pay - 1.0.1 + 1.0.2 dax-start diff --git a/dax-start/src/main/resources/application-dev.yml b/dax-start/src/main/resources/application-dev.yml index c9fc02fee..251071448 100644 --- a/dax-start/src/main/resources/application-dev.yml +++ b/dax-start/src/main/resources/application-dev.yml @@ -129,21 +129,6 @@ bootx: exception: # 显示详细异常 show-full-message: true - # 是否启用Rabbit, 并不是停用了Rabbit, 需配合 ConditionalOnRabbit 注解使用 - rabbit: - enable: false - # 表结构自动维护 - actable: - # 数据库类型 - database-type: mysql - # 更新类型 none为不进行任何操作 - update-type: update - # 扫描包路径, 可以用 ,和 ; 分隔 - scan-package: cn.bootx.**.entity - # 指定生成索引前缀 - prefix-index: idx_ - # 指定生成唯一约束前缀 - prefix-unique: uni_ starter: # 三方平台 third: @@ -164,6 +149,10 @@ bootx: corp-secret: ?? token: ?? encoding-aes-key: ?? + # 微信小程序 + wechat-applet: + app-id: ?? + app-secret: ?? # 认证 auth: default-password: 123456 @@ -182,22 +171,6 @@ bootx: - '/error' - '/favicon.ico' - '/**' - # 第三方登录 - third-login: - ding-talk: - redirect-uri: http://127.0.0.1:9999/auth/third/callback/dingTalk - client-secret: ${bootx.starter.third.ding-talk.app-secret} - client-id: ${bootx.starter.third.ding-talk.app-key} - we-com: - redirect-uri: http://127.0.0.1:9999/auth/third/callback/weCom - client-secret: ${bootx.starter.third.wecom.corp-secret} - client-id: ${bootx.starter.third.wecom.corp-id} - agent-id: ${bootx.starter.third.wecom.agent-id} - # 微信开放平台 - we-chat-open: - redirect-uri: http://127.0.0.1:9999/auth/third/callback/weChat - client-id: ?? - client-secret: ?? # 审计日志 audit-log: # 审计日志存储 diff --git a/dax-start/src/main/resources/application.yml b/dax-start/src/main/resources/application.yml index 2d84a057d..23d9abd6b 100644 --- a/dax-start/src/main/resources/application.yml +++ b/dax-start/src/main/resources/application.yml @@ -30,3 +30,9 @@ mybatis-plus: sa-token: is-print: false token-name: AccessToken +# 短信配置 +sms: + # 是否使用redis进行缓存 默认false + redis-cache: true + # 打印banner + is-print: false diff --git a/pom.xml b/pom.xml index b10a32799..75a2bc05c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.13 + 2.7.16 @@ -15,7 +15,7 @@ cn.bootx.platform bootx-dax-pay pom - 1.0.1 + 1.0.2 dax-pay @@ -28,8 +28,8 @@ 1.8 - 1.3.2 - 1.0.1 + 1.3.5 + 1.0.2 1.7.30 @@ -40,7 +40,7 @@ 4.0.0 1.5.3.Final 0.2.0 - 1.5.3 + 1.5.3 4.5.2.B 2.2.3 2.2.4