mirror of
https://gitee.com/dromara/dax-pay.git
synced 2025-09-06 12:39:38 +00:00
version 基础bootx-platform版本更新为1.3.5版本, 同步各种新特性
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
|
||||
<p>
|
||||
<img src='https://gitee.com/bootx/bootx-platform/badge/star.svg?theme=dark' alt='star'/>
|
||||
<img src="https://img.shields.io/badge/Boot%20Platform-1.3.2-success.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Boot%20Platform-1.3.5-success.svg" alt="Build Status"/>
|
||||
<img src='https://gitee.com/bootx/dax-pay/badge/star.svg?theme=dark' alt='star'/>
|
||||
<img src="https://img.shields.io/badge/Dax%20Pay-1.0.1-success.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Dax%20Pay-1.0.2-success.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Author-Bootx-orange.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.7.x-blue.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/license-Apache%20License%202.0-green.svg"/>
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>cn.bootx.platform</groupId>
|
||||
<artifactId>bootx-dax-pay</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<version>1.0.2</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>dax-pay</artifactId>
|
||||
@@ -134,8 +134,7 @@
|
||||
<!-- 自动建表 -->
|
||||
<dependency>
|
||||
<groupId>cn.bootx</groupId>
|
||||
<artifactId>mybatis-table-modify-mysql-boot-starter</artifactId>
|
||||
<version>${mybatis-table-modify.version}</version>
|
||||
<artifactId>table-modify-mysql-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 监控 -->
|
||||
@@ -165,6 +164,12 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- minio -->
|
||||
<dependency>
|
||||
<groupId>io.minio</groupId>
|
||||
<artifactId>minio</artifactId>
|
||||
<version>8.5.4</version>
|
||||
</dependency>
|
||||
<!-- 微信支付 ijpay -->
|
||||
<dependency>
|
||||
<groupId>com.github.javen205</groupId>
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
||||
/**
|
||||
* 钱包
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
||||
/**
|
||||
* 关闭支付
|
||||
*/
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
||||
|
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>cn.bootx.platform</groupId>
|
||||
<artifactId>bootx-dax-pay</artifactId>
|
||||
<version>1.0.1</version>
|
||||
<version>1.0.2</version>
|
||||
</parent>
|
||||
<artifactId>dax-start</artifactId>
|
||||
|
||||
|
@@ -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:
|
||||
# 审计日志存储
|
||||
|
@@ -30,3 +30,9 @@ mybatis-plus:
|
||||
sa-token:
|
||||
is-print: false
|
||||
token-name: AccessToken
|
||||
# 短信配置
|
||||
sms:
|
||||
# 是否使用redis进行缓存 默认false
|
||||
redis-cache: true
|
||||
# 打印banner
|
||||
is-print: false
|
||||
|
10
pom.xml
10
pom.xml
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.7.13</version>
|
||||
<version>2.7.16</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<groupId>cn.bootx.platform</groupId>
|
||||
<artifactId>bootx-dax-pay</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.0.1</version>
|
||||
<version>1.0.2</version>
|
||||
|
||||
<modules>
|
||||
<module>dax-pay</module>
|
||||
@@ -28,8 +28,8 @@
|
||||
<java.version>1.8</java.version>
|
||||
|
||||
<!-- 二方库版本 -->
|
||||
<bootx-platform.version>1.3.2</bootx-platform.version>
|
||||
<dax.version>1.0.1</dax.version>
|
||||
<bootx-platform.version>1.3.5</bootx-platform.version>
|
||||
<dax.version>1.0.2</dax.version>
|
||||
<!-- 三方库 -->
|
||||
<slf4j.version>1.7.30</slf4j.version>
|
||||
<!-- 3.5.3 有bug -->
|
||||
@@ -40,7 +40,7 @@
|
||||
<knife4j.version>4.0.0</knife4j.version>
|
||||
<mapstruct.version>1.5.3.Final</mapstruct.version>
|
||||
<lombok-mapstruct.version>0.2.0</lombok-mapstruct.version>
|
||||
<mybatis-table-modify.version>1.5.3</mybatis-table-modify.version>
|
||||
<table-modify.version>1.5.3</table-modify.version>
|
||||
<wxjava.version>4.5.2.B</wxjava.version>
|
||||
<rocketmq.version>2.2.3</rocketmq.version>
|
||||
<lock4j.version>2.2.4</lock4j.version>
|
||||
|
Reference in New Issue
Block a user