params, String body)
- throws Throwable;
-
- @Override
- public final PayRefundRespDTO getRefund(String outTradeNo, String outRefundNo) {
- try {
- return doGetRefund(outTradeNo, outRefundNo);
- } catch (ServiceException ex) { // 业务异常，都是实现类已经翻译，所以直接抛出即可
- throw ex;
- } catch (Throwable ex) {
- log.error("[getRefund][客户端({}) outTradeNo({}) outRefundNo({}) 查询退款单异常]",
- getId(), outTradeNo, outRefundNo, ex);
- throw buildPayException(ex);
- }
- }
-
- protected abstract PayRefundRespDTO doGetRefund(String outTradeNo, String outRefundNo)
- throws Throwable;
-
- @Override
- public final PayTransferRespDTO unifiedTransfer(PayTransferUnifiedReqDTO reqDTO) {
- validatePayTransferReqDTO(reqDTO);
- PayTransferRespDTO resp;
- try {
- resp = doUnifiedTransfer(reqDTO);
- } catch (ServiceException ex) { // 业务异常，都是实现类已经翻译，所以直接抛出即可
- throw ex;
- } catch (Throwable ex) {
- // 系统异常，则包装成 PayException 异常抛出
- log.error("[unifiedTransfer][客户端({}) request({}) 发起转账异常]",
- getId(), toJsonString(reqDTO), ex);
- throw buildPayException(ex);
- }
- return resp;
- }
- private void validatePayTransferReqDTO(PayTransferUnifiedReqDTO reqDTO) {
- PayTransferTypeEnum transferType = PayTransferTypeEnum.typeOf(reqDTO.getType());
- switch (transferType) {
- case ALIPAY_BALANCE: {
- ValidationUtils.validate(reqDTO, PayTransferTypeEnum.Alipay.class);
- break;
- }
- case WX_BALANCE: {
- ValidationUtils.validate(reqDTO, PayTransferTypeEnum.WxPay.class);
- break;
- }
- default: {
- throw exception(NOT_IMPLEMENTED);
- }
- }
- }
-
- @Override
- public final PayTransferRespDTO getTransfer(String outTradeNo, PayTransferTypeEnum type) {
- try {
- return doGetTransfer(outTradeNo, type);
- } catch (ServiceException ex) { // 业务异常，都是实现类已经翻译，所以直接抛出即可
- throw ex;
- } catch (Throwable ex) {
- log.error("[getTransfer][客户端({}) outTradeNo({}) type({}) 查询转账单异常]",
- getId(), outTradeNo, type, ex);
- throw buildPayException(ex);
- }
- }
-
- protected abstract PayTransferRespDTO doUnifiedTransfer(PayTransferUnifiedReqDTO reqDTO)
- throws Throwable;
-
- protected abstract PayTransferRespDTO doGetTransfer(String outTradeNo, PayTransferTypeEnum type)
- throws Throwable;
-
- // ========== 各种工具方法 ==========
-
- private PayException buildPayException(Throwable ex) {
- if (ex instanceof PayException) {
- return (PayException) ex;
- }
- throw new PayException(ex);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
deleted file mode 100644
index 80581f3049..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl;
-
-import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
-import lombok.Data;
-
-import jakarta.validation.Validator;
-
-/**
- * 无需任何配置 PayClientConfig 实现类
- *
- * @author jason
- */
-@Data
-public class NonePayClientConfig implements PayClientConfig {
-
- /**
- * 配置名称
- *
- * 如果不加任何属性，JsonUtils.parseObject2 解析会报错，所以暂时加个名称
- */
- private String name;
-
- public NonePayClientConfig(){
- this.name = "none-config";
- }
-
- @Override
- public void validate(Validator validator) {
- // 无任何配置不需要校验
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
deleted file mode 100644
index 0b39587abb..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl;
-
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.framework.pay.core.client.PayClient;
-import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.PayClientFactory;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.*;
-import cn.iocoder.yudao.framework.pay.core.client.impl.mock.MockPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.*;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import static cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum.*;
-
-/**
- * 支付客户端的工厂实现类
- *
- * @author 芋道源码
- */
-@Slf4j
-public class PayClientFactoryImpl implements PayClientFactory {
-
- /**
- * 支付客户端 Map
- *
- * key：渠道编号
- */
- private final ConcurrentMap> clients = new ConcurrentHashMap<>();
-
- /**
- * 支付客户端 Class Map
- */
- private final Map> clientClass = new ConcurrentHashMap<>();
-
- public PayClientFactoryImpl() {
- // 微信支付客户端
- clientClass.put(WX_PUB, WxPubPayClient.class);
- clientClass.put(WX_LITE, WxLitePayClient.class);
- clientClass.put(WX_APP, WxAppPayClient.class);
- clientClass.put(WX_BAR, WxBarPayClient.class);
- clientClass.put(WX_NATIVE, WxNativePayClient.class);
- // 支付包支付客户端
- clientClass.put(ALIPAY_WAP, AlipayWapPayClient.class);
- clientClass.put(ALIPAY_QR, AlipayQrPayClient.class);
- clientClass.put(ALIPAY_APP, AlipayAppPayClient.class);
- clientClass.put(ALIPAY_PC, AlipayPcPayClient.class);
- clientClass.put(ALIPAY_BAR, AlipayBarPayClient.class);
- // Mock 支付客户端
- clientClass.put(MOCK, MockPayClient.class);
- }
-
- @Override
- public void registerPayClientClass(PayChannelEnum channel, Class payClientClass) {
- clientClass.put(channel, payClientClass);
- }
-
- @Override
- public PayClient getPayClient(Long channelId) {
- AbstractPayClient client = clients.get(channelId);
- if (client == null) {
- log.error("[getPayClient][渠道编号({}) 找不到客户端]", channelId);
- }
- return client;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public void createOrUpdatePayClient(Long channelId, String channelCode,
- Config config) {
- AbstractPayClient client = (AbstractPayClient) clients.get(channelId);
- if (client == null) {
- client = this.createPayClient(channelId, channelCode, config);
- client.init();
- clients.put(client.getId(), client);
- } else {
- client.refresh(config);
- }
- }
-
- @SuppressWarnings("unchecked")
- private AbstractPayClient createPayClient(Long channelId, String channelCode,
- Config config) {
- PayChannelEnum channelEnum = PayChannelEnum.getByCode(channelCode);
- Assert.notNull(channelEnum, String.format("支付渠道(%s) 为空", channelCode));
- Class payClientClass = clientClass.get(channelEnum);
- Assert.notNull(payClientClass, String.format("支付渠道(%s) Class 为空", channelCode));
- return (AbstractPayClient) ReflectUtil.newInstance(payClientClass, channelId, config);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java
deleted file mode 100644
index 4dcf236755..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayConfig;
-import com.alipay.api.AlipayResponse;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.*;
-import com.alipay.api.internal.util.AlipaySignature;
-import com.alipay.api.request.*;
-import com.alipay.api.response.*;
-import lombok.Getter;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-import static cn.hutool.core.date.DatePattern.NORM_DATETIME_FORMATTER;
-import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_CERTIFICATE;
-
-/**
- * 支付宝抽象类，实现支付宝统一的接口、以及部分实现（退款）
- *
- * @author jason
- */
-@Slf4j
-public abstract class AbstractAlipayPayClient extends AbstractPayClient {
-
- @Getter // 仅用于单测场景
- protected DefaultAlipayClient client;
-
- public AbstractAlipayPayClient(Long channelId, String channelCode, AlipayPayClientConfig config) {
- super(channelId, channelCode, config);
- }
-
- @Override
- @SneakyThrows
- protected void doInit() {
- AlipayConfig alipayConfig = new AlipayConfig();
- BeanUtil.copyProperties(config, alipayConfig, false);
- this.client = new DefaultAlipayClient(alipayConfig);
- }
-
- // ============ 支付相关 ==========
-
- /**
- * 构造支付关闭的 {@link PayOrderRespDTO} 对象
- *
- * @return 支付关闭的 {@link PayOrderRespDTO} 对象
- */
- protected PayOrderRespDTO buildClosedPayOrderRespDTO(PayOrderUnifiedReqDTO reqDTO, AlipayResponse response) {
- Assert.isFalse(response.isSuccess());
- return PayOrderRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- reqDTO.getOutTradeNo(), response);
- }
-
- @Override
- public PayOrderRespDTO doParseOrderNotify(Map params, String body) throws Throwable {
- // 1. 校验回调数据
- Map bodyObj = HttpUtil.decodeParamMap(body, StandardCharsets.UTF_8);
- AlipaySignature.rsaCheckV1(bodyObj, config.getAlipayPublicKey(),
- StandardCharsets.UTF_8.name(), config.getSignType());
-
- // 2. 解析订单的状态
- // 额外说明：支付宝不仅仅支付成功会回调，再各种触发支付单数据变化时，都会进行回调，所以这里 status 的解析会写的比较复杂
- Integer status = parseStatus(bodyObj.get("trade_status"));
- // 特殊逻辑: 支付宝没有退款成功的状态，所以，如果有退款金额，我们认为是退款成功
- if (MapUtil.getDouble(bodyObj, "refund_fee", 0D) > 0) {
- status = PayOrderStatusRespEnum.REFUND.getStatus();
- }
- Assert.notNull(status, (Supplier) () -> {
- throw new IllegalArgumentException(StrUtil.format("body({}) 的 trade_status 不正确", body));
- });
- return PayOrderRespDTO.of(status, bodyObj.get("trade_no"), bodyObj.get("seller_id"), parseTime(params.get("gmt_payment")),
- bodyObj.get("out_trade_no"), body);
- }
-
- @Override
- protected PayOrderRespDTO doGetOrder(String outTradeNo) throws Throwable {
- // 1.1 构建 AlipayTradeRefundModel 请求
- AlipayTradeQueryModel model = new AlipayTradeQueryModel();
- model.setOutTradeNo(outTradeNo);
- // 1.2 构建 AlipayTradeQueryRequest 请求
- AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
- request.setBizModel(model);
- AlipayTradeQueryResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) {
- // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- if (!response.isSuccess()) { // 不成功，例如说订单不存在
- return PayOrderRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- outTradeNo, response);
- }
- // 2.2 解析订单的状态
- Integer status = parseStatus(response.getTradeStatus());
- Assert.notNull(status, () -> {
- throw new IllegalArgumentException(StrUtil.format("body({}) 的 trade_status 不正确", response.getBody()));
- });
- return PayOrderRespDTO.of(status, response.getTradeNo(), response.getBuyerUserId(), LocalDateTimeUtil.of(response.getSendPayDate()),
- outTradeNo, response);
- }
-
- private static Integer parseStatus(String tradeStatus) {
- return Objects.equals("WAIT_BUYER_PAY", tradeStatus) ? PayOrderStatusRespEnum.WAITING.getStatus()
- : ObjectUtils.equalsAny(tradeStatus, "TRADE_FINISHED", "TRADE_SUCCESS") ? PayOrderStatusRespEnum.SUCCESS.getStatus()
- : Objects.equals("TRADE_CLOSED", tradeStatus) ? PayOrderStatusRespEnum.CLOSED.getStatus() : null;
- }
-
- // ============ 退款相关 ==========
-
- /**
- * 支付宝统一的退款接口 alipay.trade.refund
- *
- * @param reqDTO 退款请求 request DTO
- * @return 退款请求 Response
- */
- @Override
- protected PayRefundRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 构建 AlipayTradeRefundModel 请求
- AlipayTradeRefundModel model = new AlipayTradeRefundModel();
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setOutRequestNo(reqDTO.getOutRefundNo());
- model.setRefundAmount(formatAmount(reqDTO.getRefundPrice()));
- model.setRefundReason(reqDTO.getReason());
- // 1.2 构建 AlipayTradePayRequest 请求
- AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
- request.setBizModel(model);
-
- // 2.1 执行请求
- AlipayTradeRefundResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) { // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- if (!response.isSuccess()) {
- // 当出现 ACQ.SYSTEM_ERROR, 退款可能成功也可能失败。 返回 WAIT 状态. 后续 job 会轮询
- if (ObjectUtils.equalsAny(response.getSubCode(), "ACQ.SYSTEM_ERROR", "SYSTEM_ERROR")) {
- return PayRefundRespDTO.waitingOf(null, reqDTO.getOutRefundNo(), response);
- }
- return PayRefundRespDTO.failureOf(response.getSubCode(), response.getSubMsg(), reqDTO.getOutRefundNo(), response);
- }
- // 2.2 创建返回结果
- // 支付宝只要退款调用返回 success，就认为退款成功，不需要回调。具体可见 parseNotify 方法的说明。
- // 另外，支付宝没有退款单号，所以不用设置
- return PayRefundRespDTO.successOf(null, LocalDateTimeUtil.of(response.getGmtRefundPay()),
- reqDTO.getOutRefundNo(), response);
- }
-
- @Override
- public PayRefundRespDTO doParseRefundNotify(Map params, String body) {
- // 补充说明：支付宝退款时，没有回调，这点和微信支付是不同的。并且，退款分成部分退款、和全部退款。
- // ① 部分退款：是会有回调，但是它回调的是订单状态的同步回调，不是退款订单的回调
- // ② 全部退款：Wap 支付有订单状态的同步回调，但是 PC/扫码又没有
- // 所以，这里在解析时，即使是退款导致的订单状态同步，我们也忽略不做为“退款同步”，而是订单的回调。
- // 实际上，支付宝退款只要发起成功，就可以认为退款成功，不需要等待回调。
- throw new UnsupportedOperationException("支付宝无退款回调");
- }
-
- @Override
- protected PayRefundRespDTO doGetRefund(String outTradeNo, String outRefundNo) throws AlipayApiException {
- // 1.1 构建 AlipayTradeFastpayRefundQueryModel 请求
- AlipayTradeFastpayRefundQueryModel model = new AlipayTradeFastpayRefundQueryModel();
- model.setOutTradeNo(outTradeNo);
- model.setOutRequestNo(outRefundNo);
- model.setQueryOptions(Collections.singletonList("gmt_refund_pay"));
- // 1.2 构建 AlipayTradeFastpayRefundQueryRequest 请求
- AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();
- request.setBizModel(model);
-
- // 2.1 执行请求
- AlipayTradeFastpayRefundQueryResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) { // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- if (!response.isSuccess()) {
- // 明确不存在的情况，应该就是失败，可进行关闭
- if (ObjectUtils.equalsAny(response.getSubCode(), "TRADE_NOT_EXIST", "ACQ.TRADE_NOT_EXIST")) {
- return PayRefundRespDTO.failureOf(outRefundNo, response);
- }
- // 可能存在“ACQ.SYSTEM_ERROR”系统错误等情况，所以返回 WAIT 继续等待
- return PayRefundRespDTO.waitingOf(null, outRefundNo, response);
- }
- // 2.2 创建返回结果
- if (Objects.equals(response.getRefundStatus(), "REFUND_SUCCESS")) {
- return PayRefundRespDTO.successOf(null, LocalDateTimeUtil.of(response.getGmtRefundPay()),
- outRefundNo, response);
- }
- return PayRefundRespDTO.waitingOf(null, outRefundNo, response);
- }
-
- @Override
- protected PayTransferRespDTO doUnifiedTransfer(PayTransferUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 校验公钥类型 必须使用公钥证书模式
- if (!Objects.equals(config.getMode(), MODE_CERTIFICATE)) {
- throw exception0(ERROR_CONFIGURATION.getCode(), "支付宝单笔转账必须使用公钥证书模式");
- }
- // 1.2 构建 AlipayFundTransUniTransferModel
- AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel();
- // ① 通用的参数
- model.setTransAmount(formatAmount(reqDTO.getPrice())); // 转账金额
- model.setOrderTitle(reqDTO.getSubject()); // 转账业务的标题，用于在支付宝用户的账单里显示。
- model.setOutBizNo(reqDTO.getOutTransferNo());
- model.setProductCode("TRANS_ACCOUNT_NO_PWD"); // 销售产品码。单笔无密转账固定为 TRANS_ACCOUNT_NO_PWD
- model.setBizScene("DIRECT_TRANSFER"); // 业务场景 单笔无密转账固定为 DIRECT_TRANSFER
- if (reqDTO.getChannelExtras() != null) {
- model.setBusinessParams(JsonUtils.toJsonString(reqDTO.getChannelExtras()));
- }
- // ② 个性化的参数
- Participant payeeInfo = new Participant();
- PayTransferTypeEnum transferType = PayTransferTypeEnum.typeOf(reqDTO.getType());
- switch (transferType) {
- // TODO @jason：是不是不用传递 transferType 参数哈？因为应该已经明确是支付宝啦？
- // @芋艿。 是不是还要考虑转账到银行卡。所以传 transferType 但是转账到银行卡不知道要如何测试??
- case ALIPAY_BALANCE: {
- payeeInfo.setIdentityType("ALIPAY_LOGON_ID");
- payeeInfo.setIdentity(reqDTO.getAlipayLogonId()); // 支付宝登录号
- payeeInfo.setName(reqDTO.getUserName()); // 支付宝账号姓名
- model.setPayeeInfo(payeeInfo);
- break;
- }
- case BANK_CARD: {
- payeeInfo.setIdentityType("BANKCARD_ACCOUNT");
- // TODO 待实现
- throw exception(NOT_IMPLEMENTED);
- }
- default: {
- throw exception0(BAD_REQUEST.getCode(), "不正确的转账类型: {}", transferType);
- }
- }
- // 1.3 构建 AlipayFundTransUniTransferRequest
- AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
- request.setBizModel(model);
- // 执行请求
- AlipayFundTransUniTransferResponse response = client.certificateExecute(request);
- // 处理结果
- if (!response.isSuccess()) {
- // 当出现 SYSTEM_ERROR, 转账可能成功也可能失败。 返回 WAIT 状态. 后续 job 会轮询，或相同 outBizNo 重新发起转账
- // 发现 outBizNo 相同 两次请求参数相同. 会返回 "PAYMENT_INFO_INCONSISTENCY", 不知道哪里的问题. 暂时返回 WAIT. 后续job 会轮询
- if (ObjectUtils.equalsAny(response.getSubCode(),"PAYMENT_INFO_INCONSISTENCY", "SYSTEM_ERROR", "ACQ.SYSTEM_ERROR")) {
- return PayTransferRespDTO.waitingOf(null, reqDTO.getOutTransferNo(), response);
- }
- return PayTransferRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- reqDTO.getOutTransferNo(), response);
- } else {
- if (ObjectUtils.equalsAny(response.getStatus(), "REFUND", "FAIL")) { // 转账到银行卡会出现 "REFUND" "FAIL"
- return PayTransferRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- reqDTO.getOutTransferNo(), response);
- }
- if (Objects.equals(response.getStatus(), "DEALING")) { // 转账到银行卡会出现 "DEALING" 处理中
- return PayTransferRespDTO.dealingOf(response.getOrderId(), reqDTO.getOutTransferNo(), response);
- }
- return PayTransferRespDTO.successOf(response.getOrderId(), parseTime(response.getTransDate()),
- response.getOutBizNo(), response);
- }
-
- }
-
- @Override
- protected PayTransferRespDTO doGetTransfer(String outTradeNo, PayTransferTypeEnum type) throws Throwable {
- // 1.1 构建 AlipayFundTransCommonQueryModel
- AlipayFundTransCommonQueryModel model = new AlipayFundTransCommonQueryModel();
- model.setProductCode(type == PayTransferTypeEnum.BANK_CARD ? "TRANS_BANKCARD_NO_PWD" : "TRANS_ACCOUNT_NO_PWD");
- model.setBizScene("DIRECT_TRANSFER"); //业务场景
- model.setOutBizNo(outTradeNo);
- // 1.2 构建 AlipayFundTransCommonQueryRequest
- AlipayFundTransCommonQueryRequest request = new AlipayFundTransCommonQueryRequest();
- request.setBizModel(model);
-
- // 2.1 执行请求
- AlipayFundTransCommonQueryResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) { // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- // 2.2 处理返回结果
- if (response.isSuccess()) {
- if (ObjectUtils.equalsAny(response.getStatus(), "REFUND", "FAIL")) { // 转账到银行卡会出现 "REFUND" "FAIL"
- return PayTransferRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- outTradeNo, response);
- }
- if (Objects.equals(response.getStatus(), "DEALING")) { // 转账到银行卡会出现 "DEALING" 处理中
- return PayTransferRespDTO.dealingOf(response.getOrderId(), outTradeNo, response);
- }
- return PayTransferRespDTO.successOf(response.getOrderId(), parseTime(response.getPayDate()),
- response.getOutBizNo(), response);
- } else {
- // 当出现 SYSTEM_ERROR, 转账可能成功也可能失败。 返回 WAIT 状态. 后续 job 会轮询, 或相同 outBizNo 重新发起转账
- // 当出现 ORDER_NOT_EXIST 可能是转账还在处理中,也可能是转账处理失败. 返回 WAIT 状态. 后续 job 会轮询, 或相同 outBizNo 重新发起转账
- if (ObjectUtils.equalsAny(response.getSubCode(), "ORDER_NOT_EXIST", "SYSTEM_ERROR", "ACQ.SYSTEM_ERROR")) {
- return PayTransferRespDTO.waitingOf(null, outTradeNo, response);
- }
- return PayTransferRespDTO.closedOf(response.getSubCode(), response.getSubMsg(),
- outTradeNo, response);
- }
- }
-
- // ========== 各种工具方法 ==========
-
- protected String formatAmount(Integer amount) {
- return String.valueOf(amount / 100.0);
- }
-
- protected String formatTime(LocalDateTime time) {
- return LocalDateTimeUtil.format(time, NORM_DATETIME_FORMATTER);
- }
-
- protected LocalDateTime parseTime(String str) {
- return LocalDateTimeUtil.parse(str, NORM_DATETIME_FORMATTER);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayAppPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayAppPayClient.java
deleted file mode 100644
index 4e5a37e9de..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayAppPayClient.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradeAppPayModel;
-import com.alipay.api.request.AlipayTradeAppPayRequest;
-import com.alipay.api.response.AlipayTradeAppPayResponse;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 支付宝【App 支付】的 PayClient 实现类
- *
- * 文档：App 支付
- *
- * // TODO 芋艿：未详细测试，因为手头没 App
- *
- * @author 芋道源码
- */
-@Slf4j
-public class AlipayAppPayClient extends AbstractAlipayPayClient {
-
- public AlipayAppPayClient(Long channelId, AlipayPayClientConfig config) {
- super(channelId, PayChannelEnum.ALIPAY_APP.getCode(), config);
- }
-
- @Override
- public PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 构建 AlipayTradeAppPayModel 请求
- AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
- // ① 通用的参数
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setSubject(reqDTO.getSubject());
- model.setBody(reqDTO.getBody() + "test");
- model.setTotalAmount(formatAmount(reqDTO.getPrice()));
- model.setTimeExpire(formatTime(reqDTO.getExpireTime()));
- model.setProductCode("QUICK_MSECURITY_PAY"); // 销售产品码：无线快捷支付产品
- // ② 个性化的参数【无】
- // ③ 支付宝扫码支付只有一种展示
- String displayMode = PayOrderDisplayModeEnum.APP.getMode();
-
- // 1.2 构建 AlipayTradePrecreateRequest 请求
- AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
- request.setBizModel(model);
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- request.setReturnUrl(reqDTO.getReturnUrl());
-
- // 2.1 执行请求
- AlipayTradeAppPayResponse response = client.sdkExecute(request);
- // 2.2 处理结果
- if (!response.isSuccess()) {
- return buildClosedPayOrderRespDTO(reqDTO, response);
- }
- return PayOrderRespDTO.waitingOf(displayMode, response.getBody(),
- reqDTO.getOutTradeNo(), response);
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClient.java
deleted file mode 100644
index 1f90d6b58e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClient.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradePayModel;
-import com.alipay.api.request.AlipayTradePayRequest;
-import com.alipay.api.response.AlipayTradePayResponse;
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.LocalDateTime;
-import java.util.Objects;
-
-import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_CERTIFICATE;
-
-/**
- * 支付宝【条码支付】的 PayClient 实现类
- *
- * 文档：当面付
- *
- * @author 芋道源码
- */
-@Slf4j
-public class AlipayBarPayClient extends AbstractAlipayPayClient {
-
- public AlipayBarPayClient(Long channelId, AlipayPayClientConfig config) {
- super(channelId, PayChannelEnum.ALIPAY_BAR.getCode(), config);
- }
-
- @Override
- public PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws AlipayApiException {
- String authCode = MapUtil.getStr(reqDTO.getChannelExtras(), "auth_code");
- if (StrUtil.isEmpty(authCode)) {
- throw exception0(BAD_REQUEST.getCode(), "条形码不能为空");
- }
-
- // 1.1 构建 AlipayTradePayModel 请求
- AlipayTradePayModel model = new AlipayTradePayModel();
- // ① 通用的参数
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setSubject(reqDTO.getSubject());
- model.setBody(reqDTO.getBody());
- model.setTotalAmount(formatAmount(reqDTO.getPrice()));
- model.setScene("bar_code"); // 当面付条码支付场景
- // ② 个性化的参数
- model.setAuthCode(authCode);
- // ③ 支付宝条码支付只有一种展示
- String displayMode = PayOrderDisplayModeEnum.BAR_CODE.getMode();
-
- // 1.2 构建 AlipayTradePayRequest 请求
- AlipayTradePayRequest request = new AlipayTradePayRequest();
- request.setBizModel(model);
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- request.setReturnUrl(reqDTO.getReturnUrl());
-
- // 2.1 执行请求
- AlipayTradePayResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) {
- // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- // 2.2 处理结果
- if (!response.isSuccess()) {
- return buildClosedPayOrderRespDTO(reqDTO, response);
- }
- if ("10000".equals(response.getCode())) { // 免密支付
- LocalDateTime successTime = LocalDateTimeUtil.of(response.getGmtPayment());
- return PayOrderRespDTO.successOf(response.getTradeNo(), response.getBuyerUserId(), successTime,
- response.getOutTradeNo(), response)
- .setDisplayMode(displayMode).setDisplayContent("");
- }
- // 大额支付，需要用户输入密码，所以返回 waiting。此时，前端一般会进行轮询
- return PayOrderRespDTO.waitingOf(displayMode, "",
- reqDTO.getOutTradeNo(), response);
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
deleted file mode 100644
index 13f2885d40..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
-import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
-import lombok.Data;
-
-import jakarta.validation.Validator;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-
-/**
- * 支付宝的 PayClientConfig 实现类
- * 属性主要来自 {@link com.alipay.api.AlipayConfig} 的必要属性
- *
- * @author 芋道源码
- */
-@Data
-public class AlipayPayClientConfig implements PayClientConfig {
-
- /**
- * 公钥类型 - 公钥模式
- */
- public static final Integer MODE_PUBLIC_KEY = 1;
- /**
- * 公钥类型 - 证书模式
- */
- public static final Integer MODE_CERTIFICATE = 2;
-
- /**
- * 签名算法类型 - RSA
- */
- public static final String SIGN_TYPE_DEFAULT = "RSA2";
-
- /**
- * 网关地址
- *
- * 1. 生产环境
- * 2. 沙箱环境
- */
- @NotBlank(message = "网关地址不能为空", groups = {ModePublicKey.class, ModeCertificate.class})
- private String serverUrl;
-
- /**
- * 开放平台上创建的应用的 ID
- */
- @NotBlank(message = "开放平台上创建的应用的 ID不能为空", groups = {ModePublicKey.class, ModeCertificate.class})
- private String appId;
-
- /**
- * 签名算法类型，推荐：RSA2
- *
- * {@link #SIGN_TYPE_DEFAULT}
- */
- @NotBlank(message = "签名算法类型不能为空", groups = {ModePublicKey.class, ModeCertificate.class})
- private String signType;
-
- /**
- * 公钥类型
- * 1. {@link #MODE_PUBLIC_KEY} 情况，privateKey + alipayPublicKey
- * 2. {@link #MODE_CERTIFICATE} 情况，appCertContent + alipayPublicCertContent + rootCertContent
- */
- @NotNull(message = "公钥类型不能为空", groups = {ModePublicKey.class, ModeCertificate.class})
- private Integer mode;
-
- // ========== 公钥模式 ==========
- /**
- * 商户私钥
- */
- @NotBlank(message = "商户私钥不能为空", groups = {ModePublicKey.class})
- private String privateKey;
-
- /**
- * 支付宝公钥字符串
- */
- @NotBlank(message = "支付宝公钥字符串不能为空", groups = {ModePublicKey.class})
- private String alipayPublicKey;
-
- // ========== 证书模式 ==========
- /**
- * 指定商户公钥应用证书内容字符串
- */
- @NotBlank(message = "指定商户公钥应用证书内容不能为空", groups = {ModeCertificate.class})
- private String appCertContent;
- /**
- * 指定支付宝公钥证书内容字符串
- */
- @NotBlank(message = "指定支付宝公钥证书内容不能为空", groups = {ModeCertificate.class})
- private String alipayPublicCertContent;
- /**
- * 指定根证书内容字符串
- */
- @NotBlank(message = "指定根证书内容字符串不能为空", groups = {ModeCertificate.class})
- private String rootCertContent;
-
- public interface ModePublicKey {
- }
-
- public interface ModeCertificate {
- }
-
- @Override
- public void validate(Validator validator) {
- ValidationUtils.validate(validator, this,
- MODE_PUBLIC_KEY.equals(this.getMode()) ? ModePublicKey.class : ModeCertificate.class);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java
deleted file mode 100644
index 6dbd19bef3..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.Method;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradePagePayModel;
-import com.alipay.api.request.AlipayTradePagePayRequest;
-import com.alipay.api.response.AlipayTradePagePayResponse;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Objects;
-
-/**
- * 支付宝【PC 网站】的 PayClient 实现类
- *
- * 文档：电脑网站支付
- *
- * @author XGD
- */
-@Slf4j
-public class AlipayPcPayClient extends AbstractAlipayPayClient {
-
- public AlipayPcPayClient(Long channelId, AlipayPayClientConfig config) {
- super(channelId, PayChannelEnum.ALIPAY_PC.getCode(), config);
- }
-
- @Override
- public PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 构建 AlipayTradePagePayModel 请求
- AlipayTradePagePayModel model = new AlipayTradePagePayModel();
- // ① 通用的参数
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setSubject(reqDTO.getSubject());
- model.setBody(reqDTO.getBody());
- model.setTotalAmount(formatAmount(reqDTO.getPrice()));
- model.setTimeExpire(formatTime(reqDTO.getExpireTime()));
- model.setProductCode("FAST_INSTANT_TRADE_PAY"); // 销售产品码. 目前 PC 支付场景下仅支持 FAST_INSTANT_TRADE_PAY
- // ② 个性化的参数
- // 如果想弄更多个性化的参数，可参考 https://www.pingxx.com/api/支付渠道 extra 参数说明.html 的 alipay_pc_direct 部分进行拓展
- model.setQrPayMode("2"); // 跳转模式 - 订单码，效果参见：https://help.pingxx.com/article/1137360/
- // ③ 支付宝 PC 支付有两种展示模式：FORM、URL
- String displayMode = ObjectUtil.defaultIfNull(reqDTO.getDisplayMode(),
- PayOrderDisplayModeEnum.URL.getMode());
-
- // 1.2 构建 AlipayTradePagePayRequest 请求
- AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
- request.setBizModel(model);
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- request.setReturnUrl(reqDTO.getReturnUrl());
-
- // 2.1 执行请求
- AlipayTradePagePayResponse response;
- if (Objects.equals(displayMode, PayOrderDisplayModeEnum.FORM.getMode())) {
- response = client.pageExecute(request, Method.POST.name()); // 需要特殊使用 POST 请求
- } else {
- response = client.pageExecute(request, Method.GET.name());
- }
- // 2.2 处理结果
- if (!response.isSuccess()) {
- return buildClosedPayOrderRespDTO(reqDTO, response);
- }
- return PayOrderRespDTO.waitingOf(displayMode, response.getBody(),
- reqDTO.getOutTradeNo(), response);
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java
deleted file mode 100644
index bb3ad17713..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClient.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradePrecreateModel;
-import com.alipay.api.request.AlipayTradePrecreateRequest;
-import com.alipay.api.response.AlipayTradePrecreateResponse;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.Objects;
-
-import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_CERTIFICATE;
-
-/**
- * 支付宝【扫码支付】的 PayClient 实现类
- *
- * 文档：扫码支付
- *
- * @author 芋道源码
- */
-@Slf4j
-public class AlipayQrPayClient extends AbstractAlipayPayClient {
-
- public AlipayQrPayClient(Long channelId, AlipayPayClientConfig config) {
- super(channelId, PayChannelEnum.ALIPAY_QR.getCode(), config);
- }
-
- @Override
- public PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 构建 AlipayTradePrecreateModel 请求
- AlipayTradePrecreateModel model = new AlipayTradePrecreateModel();
- // ① 通用的参数
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setSubject(reqDTO.getSubject());
- model.setBody(reqDTO.getBody());
- model.setTotalAmount(formatAmount(reqDTO.getPrice()));
- model.setProductCode("FACE_TO_FACE_PAYMENT"); // 销售产品码. 目前扫码支付场景下仅支持 FACE_TO_FACE_PAYMENT
- // ② 个性化的参数【无】
- // ③ 支付宝扫码支付只有一种展示，考虑到前端可能希望二维码扫描后，手机打开
- String displayMode = PayOrderDisplayModeEnum.QR_CODE.getMode();
-
- // 1.2 构建 AlipayTradePrecreateRequest 请求
- AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
- request.setBizModel(model);
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- request.setReturnUrl(reqDTO.getReturnUrl());
-
- // 2.1 执行请求
- AlipayTradePrecreateResponse response;
- if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) {
- // 证书模式
- response = client.certificateExecute(request);
- } else {
- response = client.execute(request);
- }
- // 2.2 处理结果
- if (!response.isSuccess()) {
- return buildClosedPayOrderRespDTO(reqDTO, response);
- }
- return PayOrderRespDTO.waitingOf(displayMode, response.getQrCode(),
- reqDTO.getOutTradeNo(), response);
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java
deleted file mode 100644
index f9dccf5a7e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClient.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.http.Method;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradeWapPayModel;
-import com.alipay.api.request.AlipayTradeWapPayRequest;
-import com.alipay.api.response.AlipayTradeWapPayResponse;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 支付宝【Wap 网站】的 PayClient 实现类
- *
- * 文档：手机网站支付接口
- *
- * @author 芋道源码
- */
-@Slf4j
-public class AlipayWapPayClient extends AbstractAlipayPayClient {
-
- public AlipayWapPayClient(Long channelId, AlipayPayClientConfig config) {
- super(channelId, PayChannelEnum.ALIPAY_WAP.getCode(), config);
- }
-
- @Override
- public PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws AlipayApiException {
- // 1.1 构建 AlipayTradeWapPayModel 请求
- AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
- // ① 通用的参数
- model.setOutTradeNo(reqDTO.getOutTradeNo());
- model.setSubject(reqDTO.getSubject());
- model.setBody(reqDTO.getBody());
- model.setTotalAmount(formatAmount(reqDTO.getPrice()));
- model.setProductCode("QUICK_WAP_PAY"); // 销售产品码. 目前 Wap 支付场景下仅支持 QUICK_WAP_PAY
- // ② 个性化的参数【无】
- // ③ 支付宝 Wap 支付只有一种展示：URL
- String displayMode = PayOrderDisplayModeEnum.URL.getMode();
-
- // 1.2 构建 AlipayTradeWapPayRequest 请求
- AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
- request.setBizModel(model);
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- request.setReturnUrl(reqDTO.getReturnUrl());
- model.setQuitUrl(reqDTO.getReturnUrl());
-
- // 2.1 执行请求
- AlipayTradeWapPayResponse response = client.pageExecute(request, Method.GET.name());
- // 2.2 处理结果
- if (!response.isSuccess()) {
- return buildClosedPayOrderRespDTO(reqDTO, response);
- }
- return PayOrderRespDTO.waitingOf(displayMode, response.getBody(),
- reqDTO.getOutTradeNo(), response);
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/mock/MockPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/mock/MockPayClient.java
deleted file mode 100644
index 1ad1ad7134..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/mock/MockPayClient.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.mock;
-
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.NonePayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-
-/**
- * 模拟支付的 PayClient 实现类
- *
- * 模拟支付返回结果都是成功，方便大家日常流畅
- *
- * @author jason
- */
-public class MockPayClient extends AbstractPayClient {
-
- private static final String MOCK_RESP_SUCCESS_DATA = "MOCK_SUCCESS";
-
- public MockPayClient(Long channelId, NonePayClientConfig config) {
- super(channelId, PayChannelEnum.MOCK.getCode(), config);
- }
-
- @Override
- protected void doInit() {
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) {
- return PayOrderRespDTO.successOf("MOCK-P-" + reqDTO.getOutTradeNo(), "", LocalDateTime.now(),
- reqDTO.getOutTradeNo(), MOCK_RESP_SUCCESS_DATA);
- }
-
- @Override
- protected PayOrderRespDTO doGetOrder(String outTradeNo) {
- return PayOrderRespDTO.successOf("MOCK-P-" + outTradeNo, "", LocalDateTime.now(),
- outTradeNo, MOCK_RESP_SUCCESS_DATA);
- }
-
- @Override
- protected PayRefundRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) {
- return PayRefundRespDTO.successOf("MOCK-R-" + reqDTO.getOutRefundNo(), LocalDateTime.now(),
- reqDTO.getOutRefundNo(), MOCK_RESP_SUCCESS_DATA);
- }
-
- @Override
- protected PayRefundRespDTO doGetRefund(String outTradeNo, String outRefundNo) {
- return PayRefundRespDTO.successOf("MOCK-R-" + outRefundNo, LocalDateTime.now(),
- outRefundNo, MOCK_RESP_SUCCESS_DATA);
- }
-
- @Override
- protected PayRefundRespDTO doParseRefundNotify(Map params, String body) {
- throw new UnsupportedOperationException("模拟支付无退款回调");
- }
-
- @Override
- protected PayOrderRespDTO doParseOrderNotify(Map params, String body) {
- throw new UnsupportedOperationException("模拟支付无支付回调");
- }
-
- @Override
- protected PayTransferRespDTO doUnifiedTransfer(PayTransferUnifiedReqDTO reqDTO) {
- throw new UnsupportedOperationException("待实现");
- }
-
- @Override
- protected PayTransferRespDTO doGetTransfer(String outTradeNo, PayTransferTypeEnum type) {
- throw new UnsupportedOperationException("待实现");
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
deleted file mode 100644
index ada1f42e6e..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
+++ /dev/null
@@ -1,483 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.date.TemporalAccessorUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.util.io.FileUtils;
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.transfer.PayTransferUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.impl.AbstractPayClient;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.transfer.PayTransferTypeEnum;
-import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Result;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
-import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
-import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyV3Result;
-import com.github.binarywang.wxpay.bean.request.*;
-import com.github.binarywang.wxpay.bean.result.*;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Map;
-import java.util.Objects;
-
-import static cn.hutool.core.date.DatePattern.*;
-import static cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig.API_VERSION_V2;
-
-/**
- * 微信支付抽象类，实现微信统一的接口、以及部分实现（退款）
- *
- * @author 遇到源码
- */
-@Slf4j
-public abstract class AbstractWxPayClient extends AbstractPayClient {
-
- protected WxPayService client;
-
- public AbstractWxPayClient(Long channelId, String channelCode, WxPayClientConfig config) {
- super(channelId, channelCode, config);
- }
-
- /**
- * 初始化 client 客户端
- *
- * @param tradeType 交易类型
- */
- protected void doInit(String tradeType) {
- // 创建 config 配置
- WxPayConfig payConfig = new WxPayConfig();
- BeanUtil.copyProperties(config, payConfig, "keyContent", "privateKeyContent", "privateCertContent");
- payConfig.setTradeType(tradeType);
- // weixin-pay-java 无法设置内容，只允许读取文件，所以这里要创建临时文件来解决
- if (Base64.isBase64(config.getKeyContent())) {
- payConfig.setKeyPath(FileUtils.createTempFile(Base64.decode(config.getKeyContent())).getPath());
- }
- if (StrUtil.isNotEmpty(config.getPrivateKeyContent())) {
- payConfig.setPrivateKeyPath(FileUtils.createTempFile(config.getPrivateKeyContent()).getPath());
- }
- if (StrUtil.isNotEmpty(config.getPrivateCertContent())) {
- payConfig.setPrivateCertPath(FileUtils.createTempFile(config.getPrivateCertContent()).getPath());
- }
-
- // 创建 client 客户端
- client = new WxPayServiceImpl();
- client.setConfig(payConfig);
- }
-
- // ============ 支付相关 ==========
-
- @Override
- protected PayOrderRespDTO doUnifiedOrder(PayOrderUnifiedReqDTO reqDTO) throws Exception {
- try {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doUnifiedOrderV2(reqDTO);
- case WxPayClientConfig.API_VERSION_V3:
- return doUnifiedOrderV3(reqDTO);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- } catch (WxPayException e) {
- String errorCode = getErrorCode(e);
- String errorMessage = getErrorMessage(e);
- return PayOrderRespDTO.closedOf(errorCode, errorMessage,
- reqDTO.getOutTradeNo(), e.getXmlString());
- }
- }
-
- /**
- * 【V2】调用支付渠道，统一下单
- *
- * @param reqDTO 下单信息
- * @return 各支付渠道的返回结果
- */
- protected abstract PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO)
- throws Exception;
-
- /**
- * 【V3】调用支付渠道，统一下单
- *
- * @param reqDTO 下单信息
- * @return 各支付渠道的返回结果
- */
- protected abstract PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO)
- throws WxPayException;
-
- /**
- * 【V2】创建微信下单请求
- *
- * @param reqDTO 下信息
- * @return 下单请求
- */
- protected WxPayUnifiedOrderRequest buildPayUnifiedOrderRequestV2(PayOrderUnifiedReqDTO reqDTO) {
- return WxPayUnifiedOrderRequest.newBuilder()
- .outTradeNo(reqDTO.getOutTradeNo())
- .body(reqDTO.getSubject())
- .detail(reqDTO.getBody())
- .totalFee(reqDTO.getPrice()) // 单位分
- .timeExpire(formatDateV2(reqDTO.getExpireTime()))
- .spbillCreateIp(reqDTO.getUserIp())
- .notifyUrl(reqDTO.getNotifyUrl())
- .build();
- }
-
- /**
- * 【V3】创建微信下单请求
- *
- * @param reqDTO 下信息
- * @return 下单请求
- */
- protected WxPayUnifiedOrderV3Request buildPayUnifiedOrderRequestV3(PayOrderUnifiedReqDTO reqDTO) {
- WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
- request.setOutTradeNo(reqDTO.getOutTradeNo());
- request.setDescription(reqDTO.getSubject());
- request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getPrice())); // 单位分
- request.setTimeExpire(formatDateV3(reqDTO.getExpireTime()));
- request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(reqDTO.getUserIp()));
- request.setNotifyUrl(reqDTO.getNotifyUrl());
- return request;
- }
-
- @Override
- public PayOrderRespDTO doParseOrderNotify(Map params, String body) throws WxPayException {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doParseOrderNotifyV2(body);
- case WxPayClientConfig.API_VERSION_V3:
- return doParseOrderNotifyV3(body);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- }
-
- private PayOrderRespDTO doParseOrderNotifyV2(String body) throws WxPayException {
- // 1. 解析回调
- WxPayOrderNotifyResult response = client.parseOrderNotifyResult(body);
- // 2. 构建结果
- // V2 微信支付的回调，只有 SUCCESS 支付成功、CLOSED 支付失败两种情况，无需像支付宝一样解析的比较复杂
- Integer status = Objects.equals(response.getResultCode(), "SUCCESS") ?
- PayOrderStatusRespEnum.SUCCESS.getStatus() : PayOrderStatusRespEnum.CLOSED.getStatus();
- return PayOrderRespDTO.of(status, response.getTransactionId(), response.getOpenid(), parseDateV2(response.getTimeEnd()),
- response.getOutTradeNo(), body);
- }
-
- private PayOrderRespDTO doParseOrderNotifyV3(String body) throws WxPayException {
- // 1. 解析回调
- WxPayNotifyV3Result response = client.parseOrderNotifyV3Result(body, null);
- WxPayNotifyV3Result.DecryptNotifyResult result = response.getResult();
- // 2. 构建结果
- Integer status = parseStatus(result.getTradeState());
- String openid = result.getPayer() != null ? result.getPayer().getOpenid() : null;
- return PayOrderRespDTO.of(status, result.getTransactionId(), openid, parseDateV3(result.getSuccessTime()),
- result.getOutTradeNo(), body);
- }
-
- @Override
- protected PayOrderRespDTO doGetOrder(String outTradeNo) throws Throwable {
- try {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doGetOrderV2(outTradeNo);
- case WxPayClientConfig.API_VERSION_V3:
- return doGetOrderV3(outTradeNo);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- } catch (WxPayException e) {
- if (ObjectUtils.equalsAny(e.getErrCode(), "ORDERNOTEXIST", "ORDER_NOT_EXIST")) {
- String errorCode = getErrorCode(e);
- String errorMessage = getErrorMessage(e);
- return PayOrderRespDTO.closedOf(errorCode, errorMessage,
- outTradeNo, e.getXmlString());
- }
- throw e;
- }
- }
-
- private PayOrderRespDTO doGetOrderV2(String outTradeNo) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayOrderQueryRequest request = WxPayOrderQueryRequest.newBuilder()
- .outTradeNo(outTradeNo).build();
- // 执行请求
- WxPayOrderQueryResult response = client.queryOrder(request);
-
- // 转换结果
- Integer status = parseStatus(response.getTradeState());
- return PayOrderRespDTO.of(status, response.getTransactionId(), response.getOpenid(), parseDateV2(response.getTimeEnd()),
- outTradeNo, response);
- }
-
- private PayOrderRespDTO doGetOrderV3(String outTradeNo) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayOrderQueryV3Request request = new WxPayOrderQueryV3Request()
- .setOutTradeNo(outTradeNo);
- // 执行请求
- WxPayOrderQueryV3Result response = client.queryOrderV3(request);
-
- // 转换结果
- Integer status = parseStatus(response.getTradeState());
- String openid = response.getPayer() != null ? response.getPayer().getOpenid() : null;
- return PayOrderRespDTO.of(status, response.getTransactionId(), openid, parseDateV3(response.getSuccessTime()),
- outTradeNo, response);
- }
-
- private static Integer parseStatus(String tradeState) {
- switch (tradeState) {
- case "NOTPAY":
- case "USERPAYING": // 支付中，等待用户输入密码（条码支付独有）
- return PayOrderStatusRespEnum.WAITING.getStatus();
- case "SUCCESS":
- return PayOrderStatusRespEnum.SUCCESS.getStatus();
- case "REFUND":
- return PayOrderStatusRespEnum.REFUND.getStatus();
- case "CLOSED":
- case "REVOKED": // 已撤销（刷卡支付独有）
- case "PAYERROR": // 支付失败（其它原因，如银行返回失败）
- return PayOrderStatusRespEnum.CLOSED.getStatus();
- default:
- throw new IllegalArgumentException(StrUtil.format("未知的支付状态({})", tradeState));
- }
- }
-
- // ============ 退款相关 ==========
-
- @Override
- protected PayRefundRespDTO doUnifiedRefund(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
- try {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doUnifiedRefundV2(reqDTO);
- case WxPayClientConfig.API_VERSION_V3:
- return doUnifiedRefundV3(reqDTO);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- } catch (WxPayException e) {
- String errorCode = getErrorCode(e);
- String errorMessage = getErrorMessage(e);
- return PayRefundRespDTO.failureOf(errorCode, errorMessage,
- reqDTO.getOutTradeNo(), e.getXmlString());
- }
- }
-
- private PayRefundRespDTO doUnifiedRefundV2(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
- // 1. 构建 WxPayRefundRequest 请求
- WxPayRefundRequest request = new WxPayRefundRequest()
- .setOutTradeNo(reqDTO.getOutTradeNo())
- .setOutRefundNo(reqDTO.getOutRefundNo())
- .setRefundFee(reqDTO.getRefundPrice())
- .setRefundDesc(reqDTO.getReason())
- .setTotalFee(reqDTO.getPayPrice())
- .setNotifyUrl(reqDTO.getNotifyUrl());
- // 2.1 执行请求
- WxPayRefundResult response = client.refundV2(request);
- // 2.2 创建返回结果
- if (Objects.equals("SUCCESS", response.getResultCode())) { // V2 情况下，不直接返回退款成功，而是等待异步通知
- return PayRefundRespDTO.waitingOf(response.getRefundId(),
- reqDTO.getOutRefundNo(), response);
- }
- return PayRefundRespDTO.failureOf(reqDTO.getOutRefundNo(), response);
- }
-
- private PayRefundRespDTO doUnifiedRefundV3(PayRefundUnifiedReqDTO reqDTO) throws Throwable {
- // 1. 构建 WxPayRefundRequest 请求
- WxPayRefundV3Request request = new WxPayRefundV3Request()
- .setOutTradeNo(reqDTO.getOutTradeNo())
- .setOutRefundNo(reqDTO.getOutRefundNo())
- .setAmount(new WxPayRefundV3Request.Amount().setRefund(reqDTO.getRefundPrice())
- .setTotal(reqDTO.getPayPrice()).setCurrency("CNY"))
- .setReason(reqDTO.getReason())
- .setNotifyUrl(reqDTO.getNotifyUrl());
- // 2.1 执行请求
- WxPayRefundV3Result response = client.refundV3(request);
- // 2.2 创建返回结果
- if (Objects.equals("SUCCESS", response.getStatus())) {
- return PayRefundRespDTO.successOf(response.getRefundId(), parseDateV3(response.getSuccessTime()),
- reqDTO.getOutRefundNo(), response);
- }
- if (Objects.equals("PROCESSING", response.getStatus())) {
- return PayRefundRespDTO.waitingOf(response.getRefundId(),
- reqDTO.getOutRefundNo(), response);
- }
- return PayRefundRespDTO.failureOf(reqDTO.getOutRefundNo(), response);
- }
-
- @Override
- public PayRefundRespDTO doParseRefundNotify(Map params, String body) throws WxPayException {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doParseRefundNotifyV2(body);
- case WxPayClientConfig.API_VERSION_V3:
- return parseRefundNotifyV3(body);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- }
-
- private PayRefundRespDTO doParseRefundNotifyV2(String body) throws WxPayException {
- // 1. 解析回调
- WxPayRefundNotifyResult response = client.parseRefundNotifyResult(body);
- WxPayRefundNotifyResult.ReqInfo result = response.getReqInfo();
- // 2. 构建结果
- if (Objects.equals("SUCCESS", result.getRefundStatus())) {
- return PayRefundRespDTO.successOf(result.getRefundId(), parseDateV2B(result.getSuccessTime()),
- result.getOutRefundNo(), response);
- }
- return PayRefundRespDTO.failureOf(result.getOutRefundNo(), response);
- }
-
- private PayRefundRespDTO parseRefundNotifyV3(String body) throws WxPayException {
- // 1. 解析回调
- WxPayRefundNotifyV3Result response = client.parseRefundNotifyV3Result(body, null);
- WxPayRefundNotifyV3Result.DecryptNotifyResult result = response.getResult();
- // 2. 构建结果
- if (Objects.equals("SUCCESS", result.getRefundStatus())) {
- return PayRefundRespDTO.successOf(result.getRefundId(), parseDateV3(result.getSuccessTime()),
- result.getOutRefundNo(), response);
- }
- return PayRefundRespDTO.failureOf(result.getOutRefundNo(), response);
- }
-
- @Override
- protected PayRefundRespDTO doGetRefund(String outTradeNo, String outRefundNo) throws WxPayException {
- try {
- switch (config.getApiVersion()) {
- case API_VERSION_V2:
- return doGetRefundV2(outTradeNo, outRefundNo);
- case WxPayClientConfig.API_VERSION_V3:
- return doGetRefundV3(outTradeNo, outRefundNo);
- default:
- throw new IllegalArgumentException(String.format("未知的 API 版本(%s)", config.getApiVersion()));
- }
- } catch (WxPayException e) {
- if (ObjectUtils.equalsAny(e.getErrCode(), "REFUNDNOTEXIST", "RESOURCE_NOT_EXISTS")) {
- String errorCode = getErrorCode(e);
- String errorMessage = getErrorMessage(e);
- return PayRefundRespDTO.failureOf(errorCode, errorMessage,
- outRefundNo, e.getXmlString());
- }
- throw e;
- }
- }
-
- private PayRefundRespDTO doGetRefundV2(String outTradeNo, String outRefundNo) throws WxPayException {
- // 1. 构建 WxPayRefundRequest 请求
- WxPayRefundQueryRequest request = WxPayRefundQueryRequest.newBuilder()
- .outTradeNo(outTradeNo)
- .outRefundNo(outRefundNo)
- .build();
- // 2.1 执行请求
- WxPayRefundQueryResult response = client.refundQuery(request);
- // 2.2 创建返回结果
- if (!Objects.equals("SUCCESS", response.getResultCode())) {
- return PayRefundRespDTO.waitingOf(null,
- outRefundNo, response);
- }
- WxPayRefundQueryResult.RefundRecord refund = CollUtil.findOne(response.getRefundRecords(),
- record -> record.getOutRefundNo().equals(outRefundNo));
- if (refund == null) {
- return PayRefundRespDTO.failureOf(outRefundNo, response);
- }
- switch (refund.getRefundStatus()) {
- case "SUCCESS":
- return PayRefundRespDTO.successOf(refund.getRefundId(), parseDateV2B(refund.getRefundSuccessTime()),
- outRefundNo, response);
- case "PROCESSING":
- return PayRefundRespDTO.waitingOf(refund.getRefundId(),
- outRefundNo, response);
- case "CHANGE": // 退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，资金回流到商户的现金帐号，需要商户人工干预，通过线下或者财付通转账的方式进行退款
- case "FAIL":
- return PayRefundRespDTO.failureOf(outRefundNo, response);
- default:
- throw new IllegalArgumentException(String.format("未知的退款状态(%s)", refund.getRefundStatus()));
- }
- }
-
- private PayRefundRespDTO doGetRefundV3(String outTradeNo, String outRefundNo) throws WxPayException {
- // 1. 构建 WxPayRefundRequest 请求
- WxPayRefundQueryV3Request request = new WxPayRefundQueryV3Request();
- request.setOutRefundNo(outRefundNo);
- // 2.1 执行请求
- WxPayRefundQueryV3Result response = client.refundQueryV3(request);
- // 2.2 创建返回结果
- switch (response.getStatus()) {
- case "SUCCESS":
- return PayRefundRespDTO.successOf(response.getRefundId(), parseDateV3(response.getSuccessTime()),
- outRefundNo, response);
- case "PROCESSING":
- return PayRefundRespDTO.waitingOf(response.getRefundId(),
- outRefundNo, response);
- case "ABNORMAL": // 退款异常
- case "CLOSED":
- return PayRefundRespDTO.failureOf(outRefundNo, response);
- default:
- throw new IllegalArgumentException(String.format("未知的退款状态(%s)", response.getStatus()));
- }
- }
-
- @Override
- protected PayTransferRespDTO doUnifiedTransfer(PayTransferUnifiedReqDTO reqDTO) {
- throw new UnsupportedOperationException("待实现");
- }
-
- @Override
- protected PayTransferRespDTO doGetTransfer(String outTradeNo, PayTransferTypeEnum type) {
- throw new UnsupportedOperationException("待实现");
- }
-
- // ========== 各种工具方法 ==========
-
- static String formatDateV2(LocalDateTime time) {
- return TemporalAccessorUtil.format(time.atZone(ZoneId.systemDefault()), PURE_DATETIME_PATTERN);
- }
-
- static LocalDateTime parseDateV2(String time) {
- return LocalDateTimeUtil.parse(time, PURE_DATETIME_PATTERN);
- }
-
- static LocalDateTime parseDateV2B(String time) {
- return LocalDateTimeUtil.parse(time, NORM_DATETIME_PATTERN);
- }
-
- static String formatDateV3(LocalDateTime time) {
- return TemporalAccessorUtil.format(time.atZone(ZoneId.systemDefault()), UTC_WITH_XXX_OFFSET_PATTERN);
- }
-
- static LocalDateTime parseDateV3(String time) {
- return LocalDateTimeUtil.parse(time, UTC_WITH_XXX_OFFSET_PATTERN);
- }
-
- static String getErrorCode(WxPayException e) {
- if (StrUtil.isNotEmpty(e.getErrCode())) {
- return e.getErrCode();
- }
- if (StrUtil.isNotEmpty(e.getCustomErrorMsg())) {
- return "CUSTOM_ERROR";
- }
- return e.getReturnCode();
- }
-
- static String getErrorMessage(WxPayException e) {
- if (StrUtil.isNotEmpty(e.getErrCode())) {
- return e.getErrCodeDes();
- }
- if (StrUtil.isNotEmpty(e.getCustomErrorMsg())) {
- return e.getCustomErrorMsg();
- }
- return e.getReturnMsg();
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxAppPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxAppPayClient.java
deleted file mode 100644
index 396694a75b..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxAppPayClient.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
-import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import lombok.extern.slf4j.Slf4j;
-
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-
-/**
- * 微信支付【App 支付】的 PayClient 实现类
- *
- * 文档：App 支付
- *
- * // TODO 芋艿：未详细测试，因为手头没 App
- *
- * @author 芋道源码
- */
-@Slf4j
-public class WxAppPayClient extends AbstractWxPayClient {
-
- public WxAppPayClient(Long channelId, WxPayClientConfig config) {
- super(channelId, PayChannelEnum.WX_APP.getCode(), config);
- }
-
- @Override
- protected void doInit() {
- super.doInit(WxPayConstants.TradeType.APP);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayUnifiedOrderRequest request = buildPayUnifiedOrderRequestV2(reqDTO);
- // 执行请求
- WxPayMpOrderResult response = client.createOrder(request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), toJsonString(response),
- reqDTO.getOutTradeNo(), response);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderV3Request 对象
- WxPayUnifiedOrderV3Request request = buildPayUnifiedOrderRequestV3(reqDTO);
- // 执行请求
- WxPayUnifiedOrderV3Result.AppResult response = client.createOrderV3(TradeTypeEnum.APP, request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), toJsonString(response),
- reqDTO.getOutTradeNo(), response);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClient.java
deleted file mode 100644
index d01b504050..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
-import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.concurrent.TimeUnit;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-
-/**
- * 微信支付【付款码支付】的 PayClient 实现类
- *
- * 文档：付款码支付
- *
- * @author 芋道源码
- */
-@Slf4j
-public class WxBarPayClient extends AbstractWxPayClient {
-
- /**
- * 微信付款码的过期时间
- */
- private static final Duration AUTH_CODE_EXPIRE = Duration.ofMinutes(3);
-
- public WxBarPayClient(Long channelId, WxPayClientConfig config) {
- super(channelId, PayChannelEnum.WX_BAR.getCode(), config);
- }
-
- @Override
- protected void doInit() {
- super.doInit(WxPayConstants.TradeType.MICROPAY);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 由于付款码需要不断轮询，所以需要在较短的时间完成支付
- LocalDateTime expireTime = LocalDateTimeUtils.addTime(AUTH_CODE_EXPIRE);
- if (expireTime.isAfter(reqDTO.getExpireTime())) {
- expireTime = reqDTO.getExpireTime();
- }
- // 构建 WxPayMicropayRequest 对象
- WxPayMicropayRequest request = WxPayMicropayRequest.newBuilder()
- .outTradeNo(reqDTO.getOutTradeNo())
- .body(reqDTO.getSubject())
- .detail(reqDTO.getBody())
- .totalFee(reqDTO.getPrice()) // 单位分
- .timeExpire(formatDateV2(expireTime))
- .spbillCreateIp(reqDTO.getUserIp())
- .authCode(getAuthCode(reqDTO))
- .build();
- // 执行请求，重试直到失败（过期），或者成功
- WxPayException lastWxPayException = null;
- for (int i = 1; i < Byte.MAX_VALUE; i++) {
- try {
- WxPayMicropayResult response = client.micropay(request);
- // 支付成功，例如说：1）用户输入了密码；2）用户免密支付
- return PayOrderRespDTO.successOf(response.getTransactionId(), response.getOpenid(), parseDateV2(response.getTimeEnd()),
- response.getOutTradeNo(), response)
- .setDisplayMode(PayOrderDisplayModeEnum.BAR_CODE.getMode());
- } catch (WxPayException ex) {
- lastWxPayException = ex;
- // 如果不满足这 3 种任一的，则直接抛出 WxPayException 异常，不仅需处理
- // 1. SYSTEMERROR：接口返回错误：请立即调用被扫订单结果查询API，查询当前订单状态，并根据订单的状态决定下一步的操作。
- // 2. USERPAYING：用户支付中，需要输入密码：等待 5 秒，然后调用被扫订单结果查询 API，查询当前订单的不同状态，决定下一步的操作。
- // 3. BANKERROR：银行系统异常：请立即调用被扫订单结果查询 API，查询当前订单的不同状态，决定下一步的操作。
- if (!StrUtil.equalsAny(ex.getErrCode(), "SYSTEMERROR", "USERPAYING", "BANKERROR")) {
- throw ex;
- }
- // 等待 5 秒，继续下一轮重新发起支付
- log.info("[doUnifiedOrderV2][发起微信 Bar 支付第({})失败，等待下一轮重试，请求({})，响应({})]", i,
- toJsonString(request), ex.getMessage());
- ThreadUtil.sleep(5, TimeUnit.SECONDS);
- }
- }
- throw lastWxPayException;
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- return doUnifiedOrderV2(reqDTO);
- }
-
- // ========== 各种工具方法 ==========
-
- static String getAuthCode(PayOrderUnifiedReqDTO reqDTO) {
- String authCode = MapUtil.getStr(reqDTO.getChannelExtras(), "authCode");
- if (StrUtil.isEmpty(authCode)) {
- throw invalidParamException("支付请求的 authCode 不能为空！");
- }
- return authCode;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxLitePayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxLitePayClient.java
deleted file mode 100644
index 9929955ae2..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxLitePayClient.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 微信支付【小程序】的 PayClient 实现类
- *
- * 由于公众号和小程序的微信支付逻辑一致，所以直接进行继承
- *
- * 文档：JSAPI 下单
- *
- * @author zwy
- */
-@Slf4j
-public class WxLitePayClient extends WxPubPayClient {
-
- public WxLitePayClient(Long channelId, WxPayClientConfig config) {
- super(channelId, PayChannelEnum.WX_LITE.getCode(), config);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java
deleted file mode 100644
index 5a073501d4..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClient.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * 微信支付【Native 二维码】的 PayClient 实现类
- *
- * 文档：Native 下单
- *
- * @author zwy
- */
-@Slf4j
-public class WxNativePayClient extends AbstractWxPayClient {
-
- public WxNativePayClient(Long channelId, WxPayClientConfig config) {
- super(channelId, PayChannelEnum.WX_NATIVE.getCode(), config);
- }
-
- @Override
- protected void doInit() {
- super.doInit(WxPayConstants.TradeType.NATIVE);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayUnifiedOrderRequest request = buildPayUnifiedOrderRequestV2(reqDTO);
- // 执行请求
- WxPayNativeOrderResult response = client.createOrder(request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.QR_CODE.getMode(), response.getCodeUrl(),
- reqDTO.getOutTradeNo(), response);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderV3Request 对象
- WxPayUnifiedOrderV3Request request = buildPayUnifiedOrderRequestV3(reqDTO);
- // 执行请求
- String response = client.createOrderV3(TradeTypeEnum.NATIVE, request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.QR_CODE.getMode(), response,
- reqDTO.getOutTradeNo(), response);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
deleted file mode 100644
index de5b0234a4..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.hutool.core.io.IoUtil;
-import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
-import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
-import lombok.Data;
-
-import jakarta.validation.Validator;
-import jakarta.validation.constraints.NotBlank;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-/**
- * 微信支付的 PayClientConfig 实现类
- * 属性主要来自 {@link com.github.binarywang.wxpay.config.WxPayConfig} 的必要属性
- *
- * @author 芋道源码
- */
-@Data
-public class WxPayClientConfig implements PayClientConfig {
-
- /**
- * API 版本 - V2
- *
- * V2 协议说明
- */
- public static final String API_VERSION_V2 = "v2";
- /**
- * API 版本 - V3
- *
- * V3 协议说明
- */
- public static final String API_VERSION_V3 = "v3";
-
- /**
- * 公众号或者小程序的 appid
- *
- * 只有公众号或小程序需要该字段
- */
- @NotBlank(message = "APPID 不能为空", groups = {V2.class, V3.class})
- private String appId;
- /**
- * 商户号
- */
- @NotBlank(message = "商户号不能为空", groups = {V2.class, V3.class})
- private String mchId;
- /**
- * API 版本
- */
- @NotBlank(message = "API 版本不能为空", groups = {V2.class, V3.class})
- private String apiVersion;
-
- // ========== V2 版本的参数 ==========
-
- /**
- * 商户密钥
- */
- @NotBlank(message = "商户密钥不能为空", groups = V2.class)
- private String mchKey;
- /**
- * apiclient_cert.p12 证书文件的对应字符串【base64 格式】
- *
- * 为什么采用 base64 格式？因为 p12 读取后是二进制，需要转换成 base64 格式才好传输和存储
- */
- @NotBlank(message = "apiclient_cert.p12 不能为空", groups = V2.class)
- private String keyContent;
-
- // ========== V3 版本的参数 ==========
- /**
- * apiclient_key.pem 证书文件的对应字符串
- */
- @NotBlank(message = "apiclient_key 不能为空", groups = V3.class)
- private String privateKeyContent;
- /**
- * apiclient_cert.pem 证书文件的对应的字符串
- */
- @NotBlank(message = "apiclient_cert 不能为空", groups = V3.class)
- private String privateCertContent;
- /**
- * apiV3 密钥值
- */
- @NotBlank(message = "apiV3 密钥值不能为空", groups = V3.class)
- private String apiV3Key;
-
- /**
- * 分组校验 v2版本
- */
- public interface V2 {
- }
-
- /**
- * 分组校验 v3版本
- */
- public interface V3 {
- }
-
- @Override
- public void validate(Validator validator) {
- ValidationUtils.validate(validator, this,
- API_VERSION_V2.equals(this.getApiVersion()) ? V2.class : V3.class);
- }
-
- public static void main(String[] args) throws FileNotFoundException {
- String path = "/Users/yunai/Downloads/wx_pay/apiclient_cert.p12";
- /// String path = "/Users/yunai/Downloads/wx_pay/apiclient_key.pem";
- /// String path = "/Users/yunai/Downloads/wx_pay/apiclient_cert.pem";
- System.out.println(IoUtil.readUtf8(new FileInputStream(path)));
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java
deleted file mode 100644
index 390c513630..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxPubPayClient.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
-import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import lombok.extern.slf4j.Slf4j;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-
-/**
- * 微信支付（公众号）的 PayClient 实现类
- *
- * 文档：JSAPI 下单
- *
- * @author 芋道源码
- */
-@Slf4j
-public class WxPubPayClient extends AbstractWxPayClient {
-
- public WxPubPayClient(Long channelId, WxPayClientConfig config) {
- super(channelId, PayChannelEnum.WX_PUB.getCode(), config);
- }
-
- protected WxPubPayClient(Long channelId, String channelCode, WxPayClientConfig config) {
- super(channelId, channelCode, config);
- }
-
- @Override
- protected void doInit() {
- super.doInit(WxPayConstants.TradeType.JSAPI);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayUnifiedOrderRequest request = buildPayUnifiedOrderRequestV2(reqDTO)
- .setOpenid(getOpenid(reqDTO));
- // 执行请求
- WxPayMpOrderResult response = client.createOrder(request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), toJsonString(response),
- reqDTO.getOutTradeNo(), response);
- }
-
- @Override
- protected PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
- // 构建 WxPayUnifiedOrderRequest 对象
- WxPayUnifiedOrderV3Request request = buildPayUnifiedOrderRequestV3(reqDTO)
- .setPayer(new WxPayUnifiedOrderV3Request.Payer().setOpenid(getOpenid(reqDTO)));
- // 执行请求
- WxPayUnifiedOrderV3Result.JsapiResult response = client.createOrderV3(TradeTypeEnum.JSAPI, request);
-
- // 转换结果
- return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), toJsonString(response),
- reqDTO.getOutTradeNo(), response);
- }
-
- // ========== 各种工具方法 ==========
-
- static String getOpenid(PayOrderUnifiedReqDTO reqDTO) {
- String openid = MapUtil.getStr(reqDTO.getChannelExtras(), "openid");
- if (StrUtil.isEmpty(openid)) {
- throw invalidParamException("支付请求的 openid 不能为空！");
- }
- return openid;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/channel/PayChannelEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/channel/PayChannelEnum.java
deleted file mode 100644
index 83d2d13add..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/channel/PayChannelEnum.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.channel;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.iocoder.yudao.framework.pay.core.client.impl.NonePayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.PayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 支付渠道的编码的枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum PayChannelEnum {
-
- WX_PUB("wx_pub", "微信 JSAPI 支付", WxPayClientConfig.class), // 公众号网页
- WX_LITE("wx_lite", "微信小程序支付", WxPayClientConfig.class),
- WX_APP("wx_app", "微信 App 支付", WxPayClientConfig.class),
- WX_NATIVE("wx_native", "微信 Native 支付", WxPayClientConfig.class),
- WX_BAR("wx_bar", "微信付款码支付", WxPayClientConfig.class),
-
- ALIPAY_PC("alipay_pc", "支付宝 PC 网站支付", AlipayPayClientConfig.class),
- ALIPAY_WAP("alipay_wap", "支付宝 Wap 网站支付", AlipayPayClientConfig.class),
- ALIPAY_APP("alipay_app", "支付宝App 支付", AlipayPayClientConfig.class),
- ALIPAY_QR("alipay_qr", "支付宝扫码支付", AlipayPayClientConfig.class),
- ALIPAY_BAR("alipay_bar", "支付宝条码支付", AlipayPayClientConfig.class),
- MOCK("mock", "模拟支付", NonePayClientConfig.class),
-
- WALLET("wallet", "钱包支付", NonePayClientConfig.class);
-
- /**
- * 编码
- *
- * 参考 支付渠道属性值
- */
- private final String code;
- /**
- * 名字
- */
- private final String name;
-
- /**
- * 配置类
- */
- private final Class configClass;
-
- /**
- * 微信支付
- */
- public static final String WECHAT = "WECHAT";
-
- /**
- * 支付宝支付
- */
- public static final String ALIPAY = "ALIPAY";
-
- public static PayChannelEnum getByCode(String code) {
- return ArrayUtil.firstMatch(o -> o.getCode().equals(code), values());
- }
-
- public static boolean isAlipay(String channelCode) {
- return channelCode != null && channelCode.startsWith("alipay");
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderDisplayModeEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderDisplayModeEnum.java
deleted file mode 100644
index 129c406029..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderDisplayModeEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.order;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 支付 UI 展示模式
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum PayOrderDisplayModeEnum {
-
- URL("url"), // Redirect 跳转链接的方式
- IFRAME("iframe"), // IFrame 内嵌链接的方式【目前暂时用不到】
- FORM("form"), // HTML 表单提交
- QR_CODE("qr_code"), // 二维码的文字内容
- QR_CODE_URL("qr_code_url"), // 二维码的图片链接
- BAR_CODE("bar_code"), // 条形码
- APP("app"), // 应用：Android、iOS、微信小程序、微信公众号等，需要做自定义处理的
- ;
-
- /**
- * 展示模式
- */
- private final String mode;
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderStatusRespEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderStatusRespEnum.java
deleted file mode 100644
index eac381c472..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/order/PayOrderStatusRespEnum.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.order;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 渠道的支付状态枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum PayOrderStatusRespEnum {
-
- WAITING(0, "未支付"),
- SUCCESS(10, "支付成功"),
- REFUND(20, "已退款"),
- CLOSED(30, "支付关闭"),
- ;
-
- private final Integer status;
- private final String name;
-
- /**
- * 判断是否支付成功
- *
- * @param status 状态
- * @return 是否支付成功
- */
- public static boolean isSuccess(Integer status) {
- return Objects.equals(status, SUCCESS.getStatus());
- }
-
- /**
- * 判断是否已退款
- *
- * @param status 状态
- * @return 是否支付成功
- */
- public static boolean isRefund(Integer status) {
- return Objects.equals(status, REFUND.getStatus());
- }
-
- /**
- * 判断是否支付关闭
- *
- * @param status 状态
- * @return 是否支付关闭
- */
- public static boolean isClosed(Integer status) {
- return Objects.equals(status, CLOSED.getStatus());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/refund/PayRefundStatusRespEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/refund/PayRefundStatusRespEnum.java
deleted file mode 100644
index 8ad61a6cff..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/refund/PayRefundStatusRespEnum.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.refund;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 渠道的退款状态枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum PayRefundStatusRespEnum {
-
- WAITING(0, "等待退款"),
- SUCCESS(10, "退款成功"),
- FAILURE(20, "退款失败");
-
- private final Integer status;
- private final String name;
-
- public static boolean isSuccess(Integer status) {
- return Objects.equals(status, SUCCESS.getStatus());
- }
-
- public static boolean isFailure(Integer status) {
- return Objects.equals(status, FAILURE.getStatus());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferStatusRespEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferStatusRespEnum.java
deleted file mode 100644
index 35ea344da2..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferStatusRespEnum.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.transfer;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * 渠道的转账状态枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum PayTransferStatusRespEnum {
-
- WAITING(0, "等待转账"),
-
- /**
- * TODO 转账到银行卡. 会有T+0 T+1 到账的请情况。 还未实现
- * TODO @jason：可以看看其它开源项目，针对这个场景，处理策略是怎么样的？例如说，每天主动轮询？这个状态的单子？
- */
- IN_PROGRESS(10, "转账进行中"),
-
- SUCCESS(20, "转账成功"),
- /**
- * 转账关闭 (失败，或者其它情况)
- */
- CLOSED(30, "转账关闭");
-
- private final Integer status;
- private final String name;
-
- public static boolean isSuccess(Integer status) {
- return Objects.equals(status, SUCCESS.getStatus());
- }
-
- public static boolean isClosed(Integer status) {
- return Objects.equals(status, CLOSED.getStatus());
- }
-
- public static boolean isInProgress(Integer status) {
- return Objects.equals(status, IN_PROGRESS.getStatus());
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferTypeEnum.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferTypeEnum.java
deleted file mode 100644
index a7580f0132..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/enums/transfer/PayTransferTypeEnum.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.enums.transfer;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 转账类型枚举
- *
- * @author jason
- */
-@AllArgsConstructor
-@Getter
-public enum PayTransferTypeEnum implements IntArrayValuable {
-
- ALIPAY_BALANCE(1, "支付宝余额"),
- WX_BALANCE(2, "微信余额"),
- BANK_CARD(3, "银行卡"),
- WALLET_BALANCE(4, "钱包余额");
-
- public interface WxPay {
- }
-
- public interface Alipay {
- }
-
- private final Integer type;
- private final String name;
-
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(PayTransferTypeEnum::getType).toArray();
-
- @Override
- public int[] array() {
- return ARRAYS;
- }
-
- public static PayTransferTypeEnum typeOf(Integer type) {
- return ArrayUtil.firstMatch(item -> item.getType().equals(type), values());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index f2a8bf1463..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.iocoder.yudao.framework.pay.config.YudaoPayAutoConfiguration
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java
deleted file mode 100644
index 9842560636..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/PayClientFactoryImplIntegrationTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl;
-
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.iocoder.yudao.framework.pay.core.client.PayClient;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayQrPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayWapPayClient;
-import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPayClientConfig;
-import cn.iocoder.yudao.framework.pay.core.client.impl.weixin.WxPubPayClient;
-import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-
-/**
- * {@link PayClientFactoryImpl} 的集成测试
- *
- * @author 芋道源码
- */
-@Disabled
-public class PayClientFactoryImplIntegrationTest {
-
- private static final String SERVER_URL_SANDBOX = "https://openapi.alipaydev.com/gateway.do";
-
- private final PayClientFactoryImpl payClientFactory = new PayClientFactoryImpl();
-
- /**
- * {@link WxPubPayClient} 的 V2 版本
- */
- @Test
- public void testCreatePayClient_WX_PUB_V2() {
- // 创建配置
- WxPayClientConfig config = new WxPayClientConfig();
- config.setAppId("wx041349c6f39b268b");
- config.setMchId("1545083881");
- config.setApiVersion(WxPayClientConfig.API_VERSION_V2);
- config.setMchKey("0alL64UDQdlCwiKZ73ib7ypaIjMns06p");
- // 创建客户端
- Long channelId = RandomUtil.randomLong();
- payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.WX_PUB.getCode(), config);
- PayClient client = payClientFactory.getPayClient(channelId);
- // 发起支付
- PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
-// CommonResult result = client.unifiedOrder(reqDTO);
-// System.out.println(result);
- }
-
- /**
- * {@link WxPubPayClient} 的 V3 版本
- */
- @Test
- public void testCreatePayClient_WX_PUB_V3() throws FileNotFoundException {
- // 创建配置
- WxPayClientConfig config = new WxPayClientConfig();
- config.setAppId("wx041349c6f39b268b");
- config.setMchId("1545083881");
- config.setApiVersion(WxPayClientConfig.API_VERSION_V3);
- config.setPrivateKeyContent(IoUtil.readUtf8(new FileInputStream("/Users/yunai/Downloads/wx_pay/apiclient_key.pem")));
- config.setPrivateCertContent(IoUtil.readUtf8(new FileInputStream("/Users/yunai/Downloads/wx_pay/apiclient_cert.pem")));
- config.setApiV3Key("joerVi8y5DJ3o4ttA0o1uH47Xz1u2Ase");
- // 创建客户端
- Long channelId = RandomUtil.randomLong();
- payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.WX_PUB.getCode(), config);
- PayClient client = payClientFactory.getPayClient(channelId);
- // 发起支付
- PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
-// CommonResult result = client.unifiedOrder(reqDTO);
-// System.out.println(result);
- }
-
- /**
- * {@link AlipayQrPayClient}
- */
- @Test
- @SuppressWarnings("unchecked")
- public void testCreatePayClient_ALIPAY_QR() {
- // 创建配置
- AlipayPayClientConfig config = new AlipayPayClientConfig();
- config.setAppId("2021000118634035");
- config.setServerUrl(SERVER_URL_SANDBOX);
- config.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
- config.setPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHsEV1cDupwJv890x84qbppUtRIfhaKSwSVN0thCcsDCaAsGR5MZslDkO8NCT9V4r2SVXjyY7eJUZlZd1M0C8T01Tg4UOx5LUbic0O3A1uJMy6V1n9IyYwbAW3AEZhBd5bSbPgrqvmv3NeWSTQT6Anxnllf+2iDH6zyA2fPl7cYyQtbZoDJQFGqr4F+cGh2R6akzRKNoBkAeMYwoY6es2lX8sJxCVPWUmxNUoL3tScwlSpd7Bxw0q9c/X01jMwuQ0+Va358zgFiGERTE6yD01eu40OBDXOYO3z++y+TAYHlQQ2toMO63trepo88X3xV3R44/1DH+k2pAm2IF5ixiLrAgMBAAECggEAPx3SoXcseaD7rmcGcE0p4SMfbsUDdkUSmBBbtfF0GzwnqNLkWa+mgE0rWt9SmXngTQH97vByAYmLPl1s3G82ht1V7Sk7yQMe74lhFllr8eEyTjeVx3dTK1EEM4TwN+936DTXdFsr4TELJEcJJdD0KaxcCcfBLRDs2wnitEFZ9N+GoZybVmY8w0e0MI7PLObUZ2l0X4RurQnfG9ZxjXjC7PkeMVv7cGGylpNFi3BbvkRhdhLPDC2E6wqnr9e7zk+hiENivAezXrtxtwKovzCtnWJ1r0IO14Rh47H509Ic0wFnj+o5YyUL4LdmpL7yaaH6fM7zcSLFjNZPHvZCKPwYcQKBgQDQFho98QvnL8ex4v6cry4VitGpjSXm1qP3vmMQk4rTsn8iPWtcxPjqGEqOQJjdi4Mi0VZKQOLFwlH0kl95wNrD/isJ4O1yeYfX7YAXApzHqYNINzM79HemO3Yx1qLMW3okRFJ9pPRzbQ9qkTpsaegsmyX316zOBhzGRYjKbutTYwKBgQCm7phr9XdFW5Vh+XR90mVs483nrLmMiDKg7YKxSLJ8amiDjzPejCn7i95Hah08P+2MIZLIPbh2VLacczR6ltRRzN5bg5etFuqSgfkuHyxpoDmpjbe08+Q2h8JBYqcC5Nhv1AKU4iOUhVLHo/FBAQliMcGc/J3eiYTFC7EsNx382QKBgClb20doe7cttgFTXswBvaUmfFm45kmla924B7SpvrQpDD/f+VDtDZRp05fGmxuduSjYdtA3aVtpLiTwWu22OUUvZZqHDGruYOO4Hvdz23mL5b4ayqImCwoNU4bAZIc9v18p/UNf3/55NNE3oGcf/bev9rH2OjCQ4nM+Ktwhg8CFAoGACSgvbkShzUkv0ZcIf9ppu+ZnJh1AdGgINvGwaJ8vQ0nm/8h8NOoFZ4oNoGc+wU5Ubops7dUM6FjPR5e+OjdJ4E7Xp7d5O4J1TaIZlCEbo5OpdhaTDDcQvrkFu+Z4eN0qzj+YAKjDAOOrXc4tbr5q0FsgXscwtcNfaBuzFVTUrUkCgYEAwzPnMNhWG3zOWLUs2QFA2GP4Y+J8cpUYfj6pbKKzeLwyG9qBwF1NJpN8m+q9q7V9P2LY+9Lp9e1mGsGeqt5HMEA3P6vIpcqLJLqE/4PBLLRzfccTcmqb1m71+erxTRhHBRkGS+I7dZEb3olQfnS1Y1tpMBxiwYwR3LW4oXuJwj8=");
- config.setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB");
- // 创建客户端
- Long channelId = RandomUtil.randomLong();
- payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.ALIPAY_QR.getCode(), config);
- PayClient client = payClientFactory.getPayClient(channelId);
- // 发起支付
- PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
- reqDTO.setNotifyUrl("http://yunai.natapp1.cc/admin-api/pay/notify/callback/18"); // TODO @tina: 这里改成你的 natapp 回调地址
-// CommonResult result = (CommonResult) client.unifiedOrder(reqDTO);
-// System.out.println(JsonUtils.toJsonString(result));
-// System.out.println(result.getData().getQrCode());
- }
-
- /**
- * {@link AlipayWapPayClient}
- */
- @Test
- public void testCreatePayClient_ALIPAY_WAP() {
- // 创建配置
- AlipayPayClientConfig config = new AlipayPayClientConfig();
- config.setAppId("2021000118634035");
- config.setServerUrl(SERVER_URL_SANDBOX);
- config.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
- config.setPrivateKey("MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHsEV1cDupwJv890x84qbppUtRIfhaKSwSVN0thCcsDCaAsGR5MZslDkO8NCT9V4r2SVXjyY7eJUZlZd1M0C8T01Tg4UOx5LUbic0O3A1uJMy6V1n9IyYwbAW3AEZhBd5bSbPgrqvmv3NeWSTQT6Anxnllf+2iDH6zyA2fPl7cYyQtbZoDJQFGqr4F+cGh2R6akzRKNoBkAeMYwoY6es2lX8sJxCVPWUmxNUoL3tScwlSpd7Bxw0q9c/X01jMwuQ0+Va358zgFiGERTE6yD01eu40OBDXOYO3z++y+TAYHlQQ2toMO63trepo88X3xV3R44/1DH+k2pAm2IF5ixiLrAgMBAAECggEAPx3SoXcseaD7rmcGcE0p4SMfbsUDdkUSmBBbtfF0GzwnqNLkWa+mgE0rWt9SmXngTQH97vByAYmLPl1s3G82ht1V7Sk7yQMe74lhFllr8eEyTjeVx3dTK1EEM4TwN+936DTXdFsr4TELJEcJJdD0KaxcCcfBLRDs2wnitEFZ9N+GoZybVmY8w0e0MI7PLObUZ2l0X4RurQnfG9ZxjXjC7PkeMVv7cGGylpNFi3BbvkRhdhLPDC2E6wqnr9e7zk+hiENivAezXrtxtwKovzCtnWJ1r0IO14Rh47H509Ic0wFnj+o5YyUL4LdmpL7yaaH6fM7zcSLFjNZPHvZCKPwYcQKBgQDQFho98QvnL8ex4v6cry4VitGpjSXm1qP3vmMQk4rTsn8iPWtcxPjqGEqOQJjdi4Mi0VZKQOLFwlH0kl95wNrD/isJ4O1yeYfX7YAXApzHqYNINzM79HemO3Yx1qLMW3okRFJ9pPRzbQ9qkTpsaegsmyX316zOBhzGRYjKbutTYwKBgQCm7phr9XdFW5Vh+XR90mVs483nrLmMiDKg7YKxSLJ8amiDjzPejCn7i95Hah08P+2MIZLIPbh2VLacczR6ltRRzN5bg5etFuqSgfkuHyxpoDmpjbe08+Q2h8JBYqcC5Nhv1AKU4iOUhVLHo/FBAQliMcGc/J3eiYTFC7EsNx382QKBgClb20doe7cttgFTXswBvaUmfFm45kmla924B7SpvrQpDD/f+VDtDZRp05fGmxuduSjYdtA3aVtpLiTwWu22OUUvZZqHDGruYOO4Hvdz23mL5b4ayqImCwoNU4bAZIc9v18p/UNf3/55NNE3oGcf/bev9rH2OjCQ4nM+Ktwhg8CFAoGACSgvbkShzUkv0ZcIf9ppu+ZnJh1AdGgINvGwaJ8vQ0nm/8h8NOoFZ4oNoGc+wU5Ubops7dUM6FjPR5e+OjdJ4E7Xp7d5O4J1TaIZlCEbo5OpdhaTDDcQvrkFu+Z4eN0qzj+YAKjDAOOrXc4tbr5q0FsgXscwtcNfaBuzFVTUrUkCgYEAwzPnMNhWG3zOWLUs2QFA2GP4Y+J8cpUYfj6pbKKzeLwyG9qBwF1NJpN8m+q9q7V9P2LY+9Lp9e1mGsGeqt5HMEA3P6vIpcqLJLqE/4PBLLRzfccTcmqb1m71+erxTRhHBRkGS+I7dZEb3olQfnS1Y1tpMBxiwYwR3LW4oXuJwj8=");
- config.setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnq90KnF4dTnlzzmxpujbI05OYqi5WxAS6cL0gnZFv2gK51HExF8v/BaP7P979PhFMgWTqmOOI+Dtno5s+yD09XTY1WkshbLk6i4g2Xlr8fyW9ODnkU88RI2w9UdPhQU4cPPwBNlrsYhKkVK2OxwM3kFqjoBBY0CZoZCsSQ3LDH5WeZqPArlsS6xa2zqJBuuoKjMrdpELl3eXSjP8K54eDJCbeetCZNKWLL3DPahTPB7LZikfYmslb0QUvCgGapD0xkS7eVq70NaL1G57MWABs4tbfWgxike4Daj3EfUrzIVspQxj7w8HEj9WozJPgL88kSJSits0pqD3n5r8HSuseQIDAQAB");
- // 创建客户端
- Long channelId = RandomUtil.randomLong();
- payClientFactory.createOrUpdatePayClient(channelId, PayChannelEnum.ALIPAY_WAP.getCode(), config);
- PayClient client = payClientFactory.getPayClient(channelId);
- // 发起支付
- PayOrderUnifiedReqDTO reqDTO = buildPayOrderUnifiedReqDTO();
-// CommonResult result = client.unifiedOrder(reqDTO);
-// System.out.println(JsonUtils.toJsonString(result));
- }
-
- private static PayOrderUnifiedReqDTO buildPayOrderUnifiedReqDTO() {
- PayOrderUnifiedReqDTO reqDTO = new PayOrderUnifiedReqDTO();
- reqDTO.setPrice(123);
- reqDTO.setSubject("IPhone 13");
- reqDTO.setBody("biubiubiu");
- reqDTO.setOutTradeNo(String.valueOf(System.currentTimeMillis()));
- reqDTO.setUserIp("127.0.0.1");
- reqDTO.setNotifyUrl("http://127.0.0.1:8080");
- return reqDTO;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java
deleted file mode 100644
index 7c45b6a90f..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AbstractAlipayClientTest.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
-import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.refund.PayRefundUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
-import cn.iocoder.yudao.framework.pay.core.enums.refund.PayRefundStatusRespEnum;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.DefaultSigner;
-import com.alipay.api.domain.AlipayTradeRefundModel;
-import com.alipay.api.request.AlipayTradeRefundRequest;
-import com.alipay.api.response.AlipayTradeRefundResponse;
-import lombok.Setter;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Mock;
-
-import jakarta.validation.ConstraintViolationException;
-import java.util.Date;
-
-import static cn.iocoder.yudao.framework.pay.core.client.impl.alipay.AlipayPayClientConfig.MODE_PUBLIC_KEY;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.when;
-
-/**
- * 支付宝 Client 的测试基类
- *
- * @author jason
- */
-public abstract class AbstractAlipayClientTest extends BaseMockitoUnitTest {
-
- protected AlipayPayClientConfig config = randomPojo(AlipayPayClientConfig.class, o -> {
- o.setServerUrl(randomURL());
- o.setPrivateKey(randomString());
- o.setMode(MODE_PUBLIC_KEY);
- o.setSignType(AlipayPayClientConfig.SIGN_TYPE_DEFAULT);
- o.setAppCertContent("");
- o.setAlipayPublicCertContent("");
- o.setRootCertContent("");
- });
-
- @Mock
- protected DefaultAlipayClient defaultAlipayClient;
-
- @Setter
- private AbstractAlipayPayClient client;
-
- /**
- * 子类需要实现该方法. 设置 client 的具体实现
- */
- @BeforeEach
- public abstract void setUp();
-
- @Test
- @DisplayName("支付宝 Client 初始化")
- public void testDoInit() {
- // 调用
- client.doInit();
- // 断言
- DefaultAlipayClient realClient = client.getClient();
- assertNotSame(defaultAlipayClient, realClient);
- assertInstanceOf(DefaultSigner.class, realClient.getSigner());
- assertEquals(config.getPrivateKey(), ((DefaultSigner) realClient.getSigner()).getPrivateKey());
- }
-
- @Test
- @DisplayName("支付宝 Client 统一退款：成功")
- public void testUnifiedRefund_success() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- Date refundTime = randomDate();
- String outRefundNo = randomString();
- String outTradeNo = randomString();
- Integer refundAmount = randomInteger();
- AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
- o.setSubCode("");
- o.setGmtRefundPay(refundTime);
- });
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
- AlipayTradeRefundModel bizModel = (AlipayTradeRefundModel) request.getBizModel();
- assertEquals(outRefundNo, bizModel.getOutRequestNo());
- assertEquals(outTradeNo, bizModel.getOutTradeNo());
- assertEquals(String.valueOf(refundAmount / 100.0), bizModel.getRefundAmount());
- return true;
- }))).thenReturn(response);
- // 准备请求参数
- PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
- o.setOutRefundNo(outRefundNo);
- o.setOutTradeNo(outTradeNo);
- o.setNotifyUrl(notifyUrl);
- o.setRefundPrice(refundAmount);
- });
-
- // 调用
- PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
- // 断言
- assertEquals(PayRefundStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
- assertEquals(outRefundNo, resp.getOutRefundNo());
- assertNull(resp.getChannelRefundNo());
- assertEquals(LocalDateTimeUtil.of(refundTime), resp.getSuccessTime());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝 Client 统一退款：渠道返回失败")
- public void test_unified_refund_channel_failed() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- String subCode = randomString();
- String subMsg = randomString();
- AlipayTradeRefundResponse response = randomPojo(AlipayTradeRefundResponse.class, o -> {
- o.setSubCode(subCode);
- o.setSubMsg(subMsg);
- });
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertInstanceOf(AlipayTradeRefundModel.class, request.getBizModel());
- return true;
- }))).thenReturn(response);
- // 准备请求参数
- String outRefundNo = randomString();
- String outTradeNo = randomString();
- PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
- o.setOutRefundNo(outRefundNo);
- o.setOutTradeNo(outTradeNo);
- o.setNotifyUrl(notifyUrl);
- });
-
- // 调用
- PayRefundRespDTO resp = client.unifiedRefund(refundReqDTO);
- // 断言
- assertEquals(PayRefundStatusRespEnum.FAILURE.getStatus(), resp.getStatus());
- assertEquals(outRefundNo, resp.getOutRefundNo());
- assertNull(resp.getChannelRefundNo());
- assertNull(resp.getSuccessTime());
- assertSame(response, resp.getRawData());
- assertEquals(subCode, resp.getChannelErrorCode());
- assertEquals(subMsg, resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝 Client 统一退款：参数校验不通过")
- public void testUnifiedRefund_paramInvalidate() {
- // 准备请求参数
- String notifyUrl = randomURL();
- PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> {
- o.setOutTradeNo("");
- o.setNotifyUrl(notifyUrl);
- });
-
- // 调用，并断言
- assertThrows(ConstraintViolationException.class, () -> client.unifiedRefund(refundReqDTO));
- }
-
- @Test
- @DisplayName("支付宝 Client 统一退款：抛出业务异常")
- public void testUnifiedRefund_throwServiceException() throws AlipayApiException {
- // mock 方法
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> true)))
- .thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
- // 准备请求参数
- String notifyUrl = randomURL();
- PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
-
- // 调用，并断言
- assertThrows(ServiceException.class, () -> client.unifiedRefund(refundReqDTO));
- }
-
- @Test
- @DisplayName("支付宝 Client 统一退款：抛出系统异常")
- public void testUnifiedRefund_throwPayException() throws AlipayApiException {
- // mock 方法
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> true)))
- .thenThrow(new RuntimeException("系统异常"));
- // 准备请求参数
- String notifyUrl = randomURL();
- PayRefundUnifiedReqDTO refundReqDTO = randomPojo(PayRefundUnifiedReqDTO.class, o -> o.setNotifyUrl(notifyUrl));
-
- // 调用，并断言
- assertThrows(PayException.class, () -> client.unifiedRefund(refundReqDTO));
- }
-
- @Test
- @DisplayName("支付宝 Client 统一下单：参数校验不通过")
- public void testUnifiedOrder_paramInvalidate() {
- // 准备请求参数
- String outTradeNo = randomString();
- String notifyUrl = randomURL();
- PayOrderUnifiedReqDTO reqDTO = randomPojo(PayOrderUnifiedReqDTO.class, o -> {
- o.setOutTradeNo(outTradeNo);
- o.setNotifyUrl(notifyUrl);
- });
-
- // 调用，并断言
- assertThrows(ConstraintViolationException.class, () -> client.unifiedOrder(reqDTO));
- }
-
- protected PayOrderUnifiedReqDTO buildOrderUnifiedReqDTO(String notifyUrl, String outTradeNo, Integer price) {
- return randomPojo(PayOrderUnifiedReqDTO.class, o -> {
- o.setOutTradeNo(outTradeNo);
- o.setNotifyUrl(notifyUrl);
- o.setPrice(price);
- o.setSubject(RandomUtil.randomString(32));
- o.setBody(RandomUtil.randomString(32));
- });
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java
deleted file mode 100644
index 47f10081ca..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayBarPayClientTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradePayModel;
-import com.alipay.api.request.AlipayTradePayRequest;
-import com.alipay.api.response.AlipayTradePayResponse;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InjectMocks;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link AlipayBarPayClient} 单元测试
- *
- * @author jason
- */
-public class AlipayBarPayClientTest extends AbstractAlipayClientTest {
-
- @InjectMocks
- private AlipayBarPayClient client = new AlipayBarPayClient(randomLongId(), config);
-
- @Override
- @BeforeEach
- public void setUp() {
- setClient(client);
- }
-
- @Test
- @DisplayName("支付宝条码支付：非免密码支付下单成功")
- public void testUnifiedOrder_success() throws AlipayApiException {
- // mock 方法
- String outTradeNo = randomString();
- String notifyUrl = randomURL();
- Integer price = randomInteger();
- String authCode = randomString();
- AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> o.setSubCode(""));
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertInstanceOf(AlipayTradePayModel.class, request.getBizModel());
- assertEquals(notifyUrl, request.getNotifyUrl());
- AlipayTradePayModel model = (AlipayTradePayModel) request.getBizModel();
- assertEquals(outTradeNo, model.getOutTradeNo());
- assertEquals(String.valueOf(price / 100.0), model.getTotalAmount());
- assertEquals(authCode, model.getAuthCode());
- return true;
- }))).thenReturn(response);
- // 准备请求参数
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
- Map extraParam = new HashMap<>();
- extraParam.put("auth_code", authCode);
- reqDTO.setChannelExtras(extraParam);
-
- // 调用方法
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(WAITING.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
- assertEquals("", resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝条码支付：免密码支付下单成功")
- public void testUnifiedOrder_code10000Success() throws AlipayApiException {
- // mock 方法
- String outTradeNo = randomString();
- String channelNo = randomString();
- String channelUserId = randomString();
- Date payTime = randomDate();
- AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
- o.setSubCode("");
- o.setCode("10000");
- o.setOutTradeNo(outTradeNo);
- o.setTradeNo(channelNo);
- o.setBuyerUserId(channelUserId);
- o.setGmtPayment(payTime);
- });
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> true)))
- .thenReturn(response);
- // 准备请求参数
- String authCode = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
- Map extraParam = new HashMap<>();
- extraParam.put("auth_code", authCode);
- reqDTO.setChannelExtras(extraParam);
-
- // 下单请求
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(PayOrderStatusRespEnum.SUCCESS.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertEquals(channelNo, resp.getChannelOrderNo());
- assertEquals(channelUserId, resp.getChannelUserId());
- assertEquals(LocalDateTimeUtil.of(payTime), resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.BAR_CODE.getMode(), resp.getDisplayMode());
- assertEquals("", resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝条码支付：没有传条码")
- public void testUnifiedOrder_emptyAuthCode() {
- // 准备参数
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), randomString(), randomInteger());
-
- // 调用，并断言
- assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
- }
-
- @Test
- @DisplayName("支付宝条码支付：渠道返回失败")
- public void test_unified_order_channel_failed() throws AlipayApiException {
- // mock 方法
- String subCode = randomString();
- String subMsg = randomString();
- AlipayTradePayResponse response = randomPojo(AlipayTradePayResponse.class, o -> {
- o.setSubCode(subCode);
- o.setSubMsg(subMsg);
- });
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> true)))
- .thenReturn(response);
- // 准备请求参数
- String authCode = randomString();
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
- Map extraParam = new HashMap<>();
- extraParam.put("auth_code", authCode);
- reqDTO.setChannelExtras(extraParam);
-
- // 调用方法
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(CLOSED.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertNull(resp.getDisplayMode());
- assertNull(resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertEquals(subCode, resp.getChannelErrorCode());
- assertEquals(subMsg, resp.getChannelErrorMsg());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java
deleted file mode 100644
index d78caf28c5..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClientTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.http.Method;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.request.AlipayTradePagePayRequest;
-import com.alipay.api.response.AlipayTradePagePayResponse;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InjectMocks;
-
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link AlipayPcPayClient} 单元测试
- *
- * @author jason
- */
-public class AlipayPcPayClientTest extends AbstractAlipayClientTest {
-
- @InjectMocks
- private AlipayPcPayClient client = new AlipayPcPayClient(randomLongId(), config);
-
- @Override
- @BeforeEach
- public void setUp() {
- setClient(client);
- }
-
- @Test
- @DisplayName("支付宝 PC 网站支付：URL Display Mode 下单成功")
- public void testUnifiedOrder_urlSuccess() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
- when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher) request -> true),
- eq(Method.GET.name()))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- Integer price = randomInteger();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
- reqDTO.setDisplayMode(null);
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(WAITING.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
- assertEquals(response.getBody(), resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝 PC 网站支付：Form Display Mode 下单成功")
- public void testUnifiedOrder_formSuccess() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> o.setSubCode(""));
- when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher) request -> true),
- eq(Method.POST.name()))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- Integer price = randomInteger();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
- reqDTO.setDisplayMode(PayOrderDisplayModeEnum.FORM.getMode());
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(WAITING.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.FORM.getMode(), resp.getDisplayMode());
- assertEquals(response.getBody(), resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝 PC 网站支付：渠道返回失败")
- public void testUnifiedOrder_channelFailed() throws AlipayApiException {
- // mock 方法
- String subCode = randomString();
- String subMsg = randomString();
- AlipayTradePagePayResponse response = randomPojo(AlipayTradePagePayResponse.class, o -> {
- o.setSubCode(subCode);
- o.setSubMsg(subMsg);
- });
- when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher) request -> true),
- eq(Method.GET.name()))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
- reqDTO.setDisplayMode(PayOrderDisplayModeEnum.URL.getMode());
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(CLOSED.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertNull(resp.getDisplayMode());
- assertNull(resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertEquals(subCode, resp.getChannelErrorCode());
- assertEquals(subMsg, resp.getChannelErrorMsg());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java
deleted file mode 100644
index c7e1eb33f7..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayQrPayClientTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
-import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.client.exception.PayException;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.request.AlipayTradePrecreateRequest;
-import com.alipay.api.response.AlipayTradePrecreateResponse;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InjectMocks;
-
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link AlipayQrPayClient} 单元测试
- *
- * @author jason
- */
-public class AlipayQrPayClientTest extends AbstractAlipayClientTest {
-
- @InjectMocks
- private AlipayQrPayClient client = new AlipayQrPayClient(randomLongId(), config);
-
- @BeforeEach
- public void setUp() {
- setClient(client);
- }
-
- @Test
- @DisplayName("支付宝扫描支付：下单成功")
- public void testUnifiedOrder_success() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- String qrCode = randomString();
- Integer price = randomInteger();
- AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
- o.setQrCode(qrCode);
- o.setSubCode("");
- });
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertEquals(notifyUrl, request.getNotifyUrl());
- return true;
- }))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(WAITING.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.QR_CODE.getMode(), resp.getDisplayMode());
- assertEquals(response.getQrCode(), resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝扫描支付：渠道返回失败")
- public void testUnifiedOrder_channelFailed() throws AlipayApiException {
- // mock 方法
- String notifyUrl = randomURL();
- String subCode = randomString();
- String subMsg = randomString();
- Integer price = randomInteger();
- AlipayTradePrecreateResponse response = randomPojo(AlipayTradePrecreateResponse.class, o -> {
- o.setSubCode(subCode);
- o.setSubMsg(subMsg);
- });
- // mock
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertEquals(notifyUrl, request.getNotifyUrl());
- return true;
- }))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(CLOSED.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertNull(resp.getDisplayMode());
- assertNull(resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertEquals(subCode, resp.getChannelErrorCode());
- assertEquals(subMsg, resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝扫描支付, 抛出系统异常")
- public void testUnifiedOrder_throwPayException() throws AlipayApiException {
- // mock 方法
- String outTradeNo = randomString();
- String notifyUrl = randomURL();
- Integer price = randomInteger();
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertEquals(notifyUrl, request.getNotifyUrl());
- return true;
- }))).thenThrow(new RuntimeException("系统异常"));
- // 准备请求参数
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo,price);
-
- // 调用，并断言
- assertThrows(PayException.class, () -> client.unifiedOrder(reqDTO));
- }
-
- @Test
- @DisplayName("支付宝 Client 统一下单：抛出业务异常")
- public void testUnifiedOrder_throwServiceException() throws AlipayApiException {
- // mock 方法
- String outTradeNo = randomString();
- String notifyUrl = randomURL();
- Integer price = randomInteger();
- when(defaultAlipayClient.execute(argThat((ArgumentMatcher) request -> {
- assertEquals(notifyUrl, request.getNotifyUrl());
- return true;
- }))).thenThrow(ServiceExceptionUtil.exception(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR));
- // 准备请求参数
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
-
- // 调用，并断言
- assertThrows(ServiceException.class, () -> client.unifiedOrder(reqDTO));
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java
deleted file mode 100644
index af0c7170bf..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayWapPayClientTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.alipay;
-
-import cn.hutool.http.Method;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
-import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
-import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.domain.AlipayTradeWapPayModel;
-import com.alipay.api.request.AlipayTradeWapPayRequest;
-import com.alipay.api.response.AlipayTradeWapPayResponse;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InjectMocks;
-
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.CLOSED;
-import static cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderStatusRespEnum.WAITING;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link AlipayWapPayClient} 单元测试
- *
- * @author jason
- */
-public class AlipayWapPayClientTest extends AbstractAlipayClientTest {
-
- /**
- * 支付宝 H5 支付 Client
- */
- @InjectMocks
- private AlipayWapPayClient client = new AlipayWapPayClient(randomLongId(), config);
-
- @BeforeEach
- public void setUp() {
- setClient(client);
- }
-
- @Test
- @DisplayName("支付宝 H5 支付：下单成功")
- public void testUnifiedOrder_success() throws AlipayApiException {
- // mock 方法
- String h5Body = randomString();
- Integer price = randomInteger();
- AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
- o.setSubCode("");
- o.setBody(h5Body);
- });
- String notifyUrl = randomURL();
- when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher) request -> {
- assertInstanceOf(AlipayTradeWapPayModel.class, request.getBizModel());
- AlipayTradeWapPayModel bizModel = (AlipayTradeWapPayModel) request.getBizModel();
- assertEquals(String.valueOf(price / 100.0), bizModel.getTotalAmount());
- assertEquals(notifyUrl, request.getNotifyUrl());
- return true;
- }), eq(Method.GET.name()))).thenReturn(response);
- // 准备请求参数
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(notifyUrl, outTradeNo, price);
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(WAITING.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertEquals(PayOrderDisplayModeEnum.URL.getMode(), resp.getDisplayMode());
- assertEquals(response.getBody(), resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertNull(resp.getChannelErrorCode());
- assertNull(resp.getChannelErrorMsg());
- }
-
- @Test
- @DisplayName("支付宝 H5 支付：渠道返回失败")
- public void test_unified_order_channel_failed() throws AlipayApiException {
- // mock 方法
- String subCode = randomString();
- String subMsg = randomString();
- AlipayTradeWapPayResponse response = randomPojo(AlipayTradeWapPayResponse.class, o -> {
- o.setSubCode(subCode);
- o.setSubMsg(subMsg);
- });
- when(defaultAlipayClient.pageExecute(argThat((ArgumentMatcher) request -> true),
- eq(Method.GET.name()))).thenReturn(response);
- String outTradeNo = randomString();
- PayOrderUnifiedReqDTO reqDTO = buildOrderUnifiedReqDTO(randomURL(), outTradeNo, randomInteger());
-
- // 调用
- PayOrderRespDTO resp = client.unifiedOrder(reqDTO);
- // 断言
- assertEquals(CLOSED.getStatus(), resp.getStatus());
- assertEquals(outTradeNo, resp.getOutTradeNo());
- assertNull(resp.getChannelOrderNo());
- assertNull(resp.getChannelUserId());
- assertNull(resp.getSuccessTime());
- assertNull(resp.getDisplayMode());
- assertNull(resp.getDisplayContent());
- assertSame(response, resp.getRawData());
- assertEquals(subCode, resp.getChannelErrorCode());
- assertEquals(subMsg, resp.getChannelErrorMsg());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java
deleted file mode 100644
index 9af11ac3fc..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxBarPayClientIntegrationTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
-import com.github.binarywang.wxpay.bean.request.WxPayMicropayRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
-import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
-import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
-import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-
-import static cn.iocoder.yudao.framework.pay.core.client.impl.weixin.AbstractWxPayClient.formatDateV2;
-
-/**
- * {@link WxBarPayClient} 的集成测试，用于快速调试微信条码支付
- *
- * @author 芋道源码
- */
-@Disabled
-public class WxBarPayClientIntegrationTest {
-
- @Test
- public void testPayV2() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV2();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行发起支付
- WxPayMicropayRequest request = WxPayMicropayRequest.newBuilder()
- .outTradeNo(String.valueOf(System.currentTimeMillis()))
- .body("测试支付-body")
- .detail("测试支付-detail")
- .totalFee(1) // 单位分
- .timeExpire(formatDateV2(LocalDateTimeUtils.addTime(Duration.ofMinutes(2))))
- .spbillCreateIp("127.0.0.1")
- .authCode("134298744426278497")
- .build();
- System.out.println("========= request ==========");
- System.out.println(JsonUtils.toJsonPrettyString(request));
- WxPayMicropayResult response = client.micropay(request);
- System.out.println("========= response ==========");
- System.out.println(JsonUtils.toJsonPrettyString(response));
- }
-
- @Test
- public void testParseRefundNotifyV2() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV2();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行解析
- String xml = "SUCCESS";
- WxPayRefundNotifyResult response = client.parseRefundNotifyResult(xml);
- System.out.println(response.getReqInfo());
- }
-
- @Test
- public void testRefundV2() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV2();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行发起退款
- WxPayRefundRequest request = new WxPayRefundRequest()
- .setOutTradeNo("1689545667276")
- .setOutRefundNo(String.valueOf(System.currentTimeMillis()))
- .setRefundFee(1)
- .setRefundDesc("就是想退了")
- .setTotalFee(1);
- System.out.println("========= request ==========");
- System.out.println(JsonUtils.toJsonPrettyString(request));
- WxPayRefundResult response = client.refund(request);
- System.out.println("========= response ==========");
- System.out.println(JsonUtils.toJsonPrettyString(response));
- }
-
- @Test
- public void testRefundV3() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV2();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行发起退款
- WxPayRefundV3Request request = new WxPayRefundV3Request()
- .setOutTradeNo("1689506325635")
- .setOutRefundNo(String.valueOf(System.currentTimeMillis()))
- .setAmount(new WxPayRefundV3Request.Amount().setTotal(1).setRefund(1).setCurrency("CNY"))
- .setReason("就是想退了");
- System.out.println("========= request ==========");
- System.out.println(JsonUtils.toJsonPrettyString(request));
- WxPayRefundV3Result response = client.refundV3(request);
- System.out.println("========= response ==========");
- System.out.println(JsonUtils.toJsonPrettyString(response));
- }
-
- private WxPayConfig buildWxPayConfigV2() {
- WxPayConfig config = new WxPayConfig();
- config.setAppId("wx62056c0d5e8db250");
- config.setMchId("1545083881");
- config.setMchKey("dS1ngeN63JLr3NRbvPH9AJy3MyUxZdim");
-// config.setSignType(WxPayConstants.SignType.MD5);
- config.setKeyPath("/Users/yunai/Downloads/wx_pay/apiclient_cert.p12");
- return config;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java
deleted file mode 100644
index 5e73601c2b..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn/iocoder/yudao/framework/pay/core/client/impl/weixin/WxNativePayClientIntegrationTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
-
-import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
-import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-
-import static cn.iocoder.yudao.framework.pay.core.client.impl.weixin.AbstractWxPayClient.formatDateV3;
-
-/**
- * {@link WxNativePayClient} 的集成测试，用于快速调试微信扫码支付
- *
- * @author 芋道源码
- */
-@Disabled
-public class WxNativePayClientIntegrationTest {
-
- @Test
- public void testPayV3() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV3();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行发起支付
- WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request()
- .setOutTradeNo(String.valueOf(System.currentTimeMillis()))
- .setDescription("测试支付-body")
- .setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(1)) // 单位分
- .setTimeExpire(formatDateV3(LocalDateTimeUtils.addTime(Duration.ofMinutes(2))))
- .setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp("127.0.0.1"))
- .setNotifyUrl("http://127.0.0.1:48080");
- System.out.println("========= request ==========");
- System.out.println(JsonUtils.toJsonPrettyString(request));
- String response = client.createOrderV3(TradeTypeEnum.NATIVE, request);
- System.out.println("========= response ==========");
- System.out.println(JsonUtils.toJsonPrettyString(response));
- }
-
- @Test
- public void testRefundV3() throws WxPayException {
- // 创建 config 配置
- WxPayConfig config = buildWxPayConfigV3();
- // 创建 WxPayService 客户端
- WxPayService client = new WxPayServiceImpl();
- client.setConfig(config);
-
- // 执行发起退款
- WxPayRefundV3Request request = new WxPayRefundV3Request()
- .setOutTradeNo("1689545729695")
- .setOutRefundNo(String.valueOf(System.currentTimeMillis()))
- .setAmount(new WxPayRefundV3Request.Amount().setTotal(1).setRefund(1).setCurrency("CNY"))
- .setReason("就是想退了");
- System.out.println("========= request ==========");
- System.out.println(JsonUtils.toJsonPrettyString(request));
- WxPayRefundV3Result response = client.refundV3(request);
- System.out.println("========= response ==========");
- System.out.println(JsonUtils.toJsonPrettyString(response));
- }
-
- private WxPayConfig buildWxPayConfigV3() {
- WxPayConfig config = new WxPayConfig();
- config.setAppId("wx62056c0d5e8db250");
- config.setMchId("1545083881");
- config.setApiV3Key("459arNsYHl1mgkiO6H9ZH5KkhFXSxaA4");
-// config.setCertSerialNo(serialNo);
- config.setPrivateCertPath("/Users/yunai/Downloads/wx_pay/apiclient_cert.pem");
- config.setPrivateKeyPath("/Users/yunai/Downloads/wx_pay/apiclient_key.pem");
- return config;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml
index faa6a8d34d..c0d056c18d 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-sms/pom.xml
@@ -33,13 +33,6 @@
opentracing-util
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
- test
-
-
com.google.guava
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
deleted file mode 100644
index c60cd26a1b..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/aliyun/AliyunSmsClientTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl.aliyun;
-
-import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateRequest;
-import com.aliyuncs.dysmsapi.model.v20170525.QuerySmsTemplateResponse;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
-import com.google.common.collect.Lists;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link AliyunSmsClient} 的单元测试
- *
- * @author 芋道源码
- */
-public class AliyunSmsClientTest extends BaseMockitoUnitTest {
-
- private final SmsChannelProperties properties = new SmsChannelProperties()
- .setApiKey(randomString()) // 随机一个 apiKey，避免构建报错
- .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错
- .setSignature("芋道源码");
-
- @InjectMocks
- private final AliyunSmsClient smsClient = new AliyunSmsClient(properties);
-
- @Mock
- private IAcsClient client;
-
- @Test
- public void testDoInit() {
- // 准备参数
- // mock 方法
-
- // 调用
- smsClient.doInit();
- // 断言
- assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "acsClient"));
- }
-
- @Test
- public void tesSendSms_success() throws Throwable {
- // 准备参数
- Long sendLogId = randomLongId();
- String mobile = randomString();
- String apiTemplateId = randomString();
- List> templateParams = Lists.newArrayList(
- new KeyValue<>("code", 1234), new KeyValue<>("op", "login"));
- // mock 方法
- SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> o.setCode("OK"));
- when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> {
- assertEquals(mobile, acsRequest.getPhoneNumbers());
- assertEquals(properties.getSignature(), acsRequest.getSignName());
- assertEquals(apiTemplateId, acsRequest.getTemplateCode());
- assertEquals(toJsonString(MapUtils.convertMap(templateParams)), acsRequest.getTemplateParam());
- assertEquals(sendLogId.toString(), acsRequest.getOutId());
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile,
- apiTemplateId, templateParams);
- // 断言
- assertTrue(result.getSuccess());
- assertEquals(response.getRequestId(), result.getApiRequestId());
- assertEquals(response.getCode(), result.getApiCode());
- assertEquals(response.getMessage(), result.getApiMsg());
- assertEquals(response.getBizId(), result.getSerialNo());
- }
-
- @Test
- public void tesSendSms_fail() throws Throwable {
- // 准备参数
- Long sendLogId = randomLongId();
- String mobile = randomString();
- String apiTemplateId = randomString();
- List> templateParams = Lists.newArrayList(
- new KeyValue<>("code", 1234), new KeyValue<>("op", "login"));
- // mock 方法
- SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> o.setCode("ERROR"));
- when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> {
- assertEquals(mobile, acsRequest.getPhoneNumbers());
- assertEquals(properties.getSignature(), acsRequest.getSignName());
- assertEquals(apiTemplateId, acsRequest.getTemplateCode());
- assertEquals(toJsonString(MapUtils.convertMap(templateParams)), acsRequest.getTemplateParam());
- assertEquals(sendLogId.toString(), acsRequest.getOutId());
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams);
- // 断言
- assertFalse(result.getSuccess());
- assertEquals(response.getRequestId(), result.getApiRequestId());
- assertEquals(response.getCode(), result.getApiCode());
- assertEquals(response.getMessage(), result.getApiMsg());
- assertEquals(response.getBizId(), result.getSerialNo());
- }
-
- @Test
- public void testParseSmsReceiveStatus() {
- // 准备参数
- String text = "[\n" +
- " {\n" +
- " \"phone_number\" : \"13900000001\",\n" +
- " \"send_time\" : \"2017-01-01 11:12:13\",\n" +
- " \"report_time\" : \"2017-02-02 22:23:24\",\n" +
- " \"success\" : true,\n" +
- " \"err_code\" : \"DELIVERED\",\n" +
- " \"err_msg\" : \"用户接收成功\",\n" +
- " \"sms_size\" : \"1\",\n" +
- " \"biz_id\" : \"12345\",\n" +
- " \"out_id\" : \"67890\"\n" +
- " }\n" +
- "]";
- // mock 方法
-
- // 调用
- List statuses = smsClient.parseSmsReceiveStatus(text);
- // 断言
- assertEquals(1, statuses.size());
- assertTrue(statuses.get(0).getSuccess());
- assertEquals("DELIVERED", statuses.get(0).getErrorCode());
- assertEquals("用户接收成功", statuses.get(0).getErrorMsg());
- assertEquals("13900000001", statuses.get(0).getMobile());
- assertEquals(LocalDateTime.of(2017, 2, 2, 22, 23, 24),
- statuses.get(0).getReceiveTime());
- assertEquals("12345", statuses.get(0).getSerialNo());
- assertEquals(67890L, statuses.get(0).getLogId());
- }
-
- @Test
- public void testGetSmsTemplate() throws Throwable {
- // 准备参数
- String apiTemplateId = randomString();
- // mock 方法
- QuerySmsTemplateResponse response = randomPojo(QuerySmsTemplateResponse.class, o -> {
- o.setCode("OK");
- o.setTemplateStatus(1); // 设置模板通过
- });
- when(client.getAcsResponse(argThat((ArgumentMatcher) acsRequest -> {
- assertEquals(apiTemplateId, acsRequest.getTemplateCode());
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsTemplateRespDTO result = smsClient.getSmsTemplate(apiTemplateId);
- // 断言
- assertEquals(response.getTemplateCode(), result.getId());
- assertEquals(response.getTemplateContent(), result.getContent());
- assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), result.getAuditStatus());
- assertEquals(response.getReason(), result.getAuditReason());
- }
-
- @Test
- public void testConvertSmsTemplateAuditStatus() {
- assertEquals(SmsTemplateAuditStatusEnum.CHECKING.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(0));
- assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(1));
- assertEquals(SmsTemplateAuditStatusEnum.FAIL.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(2));
- assertThrows(IllegalArgumentException.class, () -> smsClient.convertSmsTemplateAuditStatus(3),
- "未知审核状态(3)");
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java
deleted file mode 100644
index d62eed1e1f..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/tencent/TencentSmsClientTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package cn.iocoder.yudao.framework.sms.core.client.impl.tencent;
-
-import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.framework.common.core.KeyValue;
-import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsReceiveRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsSendRespDTO;
-import cn.iocoder.yudao.framework.sms.core.client.dto.SmsTemplateRespDTO;
-import cn.iocoder.yudao.framework.sms.core.enums.SmsTemplateAuditStatusEnum;
-import cn.iocoder.yudao.framework.sms.core.property.SmsChannelProperties;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
-import com.google.common.collect.Lists;
-import com.tencentcloudapi.sms.v20210111.SmsClient;
-import com.tencentcloudapi.sms.v20210111.models.DescribeSmsTemplateListResponse;
-import com.tencentcloudapi.sms.v20210111.models.DescribeTemplateListStatus;
-import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
-import com.tencentcloudapi.sms.v20210111.models.SendStatus;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.json.JsonUtils.toJsonString;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.when;
-
-/**
- * {@link TencentSmsClient} 的单元测试
- *
- * @author shiwp
- */
-public class TencentSmsClientTest extends BaseMockitoUnitTest {
-
- private final SmsChannelProperties properties = new SmsChannelProperties()
- .setApiKey(randomString() + " " + randomString()) // 随机一个 apiKey，避免构建报错
- .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错
- .setSignature("芋道源码");
-
- @InjectMocks
- private TencentSmsClient smsClient = new TencentSmsClient(properties);
-
- @Mock
- private SmsClient client;
-
- @Test
- public void testDoInit() {
- // 准备参数
- // mock 方法
-
- // 调用
- smsClient.doInit();
- // 断言
- assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "client"));
- }
-
- @Test
- public void testRefresh() {
- // 准备参数
- SmsChannelProperties p = new SmsChannelProperties()
- .setApiKey(randomString() + " " + randomString()) // 随机一个 apiKey，避免构建报错
- .setApiSecret(randomString()) // 随机一个 apiSecret，避免构建报错
- .setSignature("芋道源码");
- // 调用
- smsClient.refresh(p);
- // 断言
- assertNotSame(client, ReflectUtil.getFieldValue(smsClient, "client"));
- }
-
- @Test
- public void testDoSendSms_success() throws Throwable {
- // 准备参数
- Long sendLogId = randomLongId();
- String mobile = randomString();
- String apiTemplateId = randomString();
- List> templateParams = Lists.newArrayList(
- new KeyValue<>("1", 1234), new KeyValue<>("2", "login"));
- String requestId = randomString();
- String serialNo = randomString();
- // mock 方法
- SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> {
- o.setRequestId(requestId);
- SendStatus[] sendStatuses = new SendStatus[1];
- o.setSendStatusSet(sendStatuses);
- SendStatus sendStatus = new SendStatus();
- sendStatuses[0] = sendStatus;
- sendStatus.setCode(TencentSmsClient.API_CODE_SUCCESS);
- sendStatus.setMessage("send success");
- sendStatus.setSerialNo(serialNo);
- });
- when(client.SendSms(argThat(request -> {
- assertEquals(mobile, request.getPhoneNumberSet()[0]);
- assertEquals(properties.getSignature(), request.getSignName());
- assertEquals(apiTemplateId, request.getTemplateId());
- assertEquals(toJsonString(ArrayUtils.toArray(new ArrayList<>(MapUtils.convertMap(templateParams).values()), String::valueOf)),
- toJsonString(request.getTemplateParamSet()));
- assertEquals(sendLogId, ReflectUtil.getFieldValue(JsonUtils.parseObject(request.getSessionContext(), TencentSmsClient.SessionContext.class), "logId"));
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams);
- // 断言
- assertTrue(result.getSuccess());
- assertEquals(response.getRequestId(), result.getApiRequestId());
- assertEquals(response.getSendStatusSet()[0].getCode(), result.getApiCode());
- assertEquals(response.getSendStatusSet()[0].getMessage(), result.getApiMsg());
- assertEquals(response.getSendStatusSet()[0].getSerialNo(), result.getSerialNo());
- }
-
- @Test
- public void testDoSendSms_fail() throws Throwable {
- // 准备参数
- Long sendLogId = randomLongId();
- String mobile = randomString();
- String apiTemplateId = randomString();
- List> templateParams = Lists.newArrayList(
- new KeyValue<>("1", 1234), new KeyValue<>("2", "login"));
- String requestId = randomString();
- String serialNo = randomString();
- // mock 方法
- SendSmsResponse response = randomPojo(SendSmsResponse.class, o -> {
- o.setRequestId(requestId);
- SendStatus[] sendStatuses = new SendStatus[1];
- o.setSendStatusSet(sendStatuses);
- SendStatus sendStatus = new SendStatus();
- sendStatuses[0] = sendStatus;
- sendStatus.setCode("ERROR");
- sendStatus.setMessage("send success");
- sendStatus.setSerialNo(serialNo);
- });
- when(client.SendSms(argThat(request -> {
- assertEquals(mobile, request.getPhoneNumberSet()[0]);
- assertEquals(properties.getSignature(), request.getSignName());
- assertEquals(apiTemplateId, request.getTemplateId());
- assertEquals(toJsonString(ArrayUtils.toArray(new ArrayList<>(MapUtils.convertMap(templateParams).values()), String::valueOf)),
- toJsonString(request.getTemplateParamSet()));
- assertEquals(sendLogId, ReflectUtil.getFieldValue(JsonUtils.parseObject(request.getSessionContext(), TencentSmsClient.SessionContext.class), "logId"));
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams);
- // 断言
- assertFalse(result.getSuccess());
- assertEquals(response.getRequestId(), result.getApiRequestId());
- assertEquals(response.getSendStatusSet()[0].getCode(), result.getApiCode());
- assertEquals(response.getSendStatusSet()[0].getMessage(), result.getApiMsg());
- assertEquals(response.getSendStatusSet()[0].getSerialNo(), result.getSerialNo());
- }
-
- @Test
- public void testParseSmsReceiveStatus() {
- // 准备参数
- String text = "[\n" +
- " {\n" +
- " \"user_receive_time\": \"2015-10-17 08:03:04\",\n" +
- " \"nationcode\": \"86\",\n" +
- " \"mobile\": \"13900000001\",\n" +
- " \"report_status\": \"SUCCESS\",\n" +
- " \"errmsg\": \"DELIVRD\",\n" +
- " \"description\": \"用户短信送达成功\",\n" +
- " \"sid\": \"12345\",\n" +
- " \"ext\": {\"logId\":\"67890\"}\n" +
- " }\n" +
- "]";
- // mock 方法
-
- // 调用
- List statuses = smsClient.parseSmsReceiveStatus(text);
- // 断言
- assertEquals(1, statuses.size());
- assertTrue(statuses.get(0).getSuccess());
- assertEquals("DELIVRD", statuses.get(0).getErrorCode());
- assertEquals("用户短信送达成功", statuses.get(0).getErrorMsg());
- assertEquals("13900000001", statuses.get(0).getMobile());
- assertEquals(LocalDateTime.of(2015, 10, 17, 8, 3, 4), statuses.get(0).getReceiveTime());
- assertEquals("12345", statuses.get(0).getSerialNo());
- assertEquals(67890L, statuses.get(0).getLogId());
- }
-
- @Test
- public void testGetSmsTemplate() throws Throwable {
- // 准备参数
- Long apiTemplateId = randomLongId();
- String requestId = randomString();
-
- // mock 方法
- DescribeSmsTemplateListResponse response = randomPojo(DescribeSmsTemplateListResponse.class, o -> {
- DescribeTemplateListStatus[] describeTemplateListStatuses = new DescribeTemplateListStatus[1];
- DescribeTemplateListStatus templateStatus = new DescribeTemplateListStatus();
- templateStatus.setTemplateId(apiTemplateId);
- templateStatus.setStatusCode(0L);// 设置模板通过
- describeTemplateListStatuses[0] = templateStatus;
- o.setDescribeTemplateStatusSet(describeTemplateListStatuses);
- o.setRequestId(requestId);
- });
- when(client.DescribeSmsTemplateList(argThat(request -> {
- assertEquals(apiTemplateId, request.getTemplateIdSet()[0]);
- return true;
- }))).thenReturn(response);
-
- // 调用
- SmsTemplateRespDTO result = smsClient.getSmsTemplate(apiTemplateId.toString());
- // 断言
- assertEquals(response.getDescribeTemplateStatusSet()[0].getTemplateId().toString(), result.getId());
- assertEquals(response.getDescribeTemplateStatusSet()[0].getTemplateContent(), result.getContent());
- assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(), result.getAuditStatus());
- assertEquals(response.getDescribeTemplateStatusSet()[0].getReviewReply(), result.getAuditReason());
- }
-
- @Test
- public void testConvertSmsTemplateAuditStatus() {
- assertEquals(SmsTemplateAuditStatusEnum.SUCCESS.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(0));
- assertEquals(SmsTemplateAuditStatusEnum.CHECKING.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(1));
- assertEquals(SmsTemplateAuditStatusEnum.FAIL.getStatus(),
- smsClient.convertSmsTemplateAuditStatus(-1));
- assertThrows(IllegalArgumentException.class, () -> smsClient.convertSmsTemplateAuditStatus(3),
- "未知审核状态(3)");
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
index c1a537613e..b831767fc6 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml
@@ -66,13 +66,6 @@
true
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
- test
-
-
com.google.guava
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
index c4a96ebe1e..90d30fa1c3 100644
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-desensitize/pom.xml
@@ -28,11 +28,5 @@
jackson-databind
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
- test
-
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
deleted file mode 100644
index c308a0eb55..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/DesensitizeTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core;
-
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.EmailDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.regex.annotation.RegexDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.BankCardDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.CarLicenseDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.ChineseNameDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.FixedPhoneDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.IdCardDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.PasswordDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.MobileDesensitize;
-import cn.iocoder.yudao.framework.desensitize.core.slider.annotation.SliderDesensitize;
-import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
-import lombok.Data;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link DesensitizeTest} 的单元测试
- */
-public class DesensitizeTest extends BaseMockitoUnitTest {
-
- @Test
- public void test() {
- // 准备参数
- DesensitizeDemo desensitizeDemo = new DesensitizeDemo();
- desensitizeDemo.setNickname("芋道源码");
- desensitizeDemo.setBankCard("9988002866797031");
- desensitizeDemo.setCarLicense("粤A66666");
- desensitizeDemo.setFixedPhone("01086551122");
- desensitizeDemo.setIdCard("530321199204074611");
- desensitizeDemo.setPassword("123456");
- desensitizeDemo.setPhoneNumber("13248765917");
- desensitizeDemo.setSlider1("ABCDEFG");
- desensitizeDemo.setSlider2("ABCDEFG");
- desensitizeDemo.setSlider3("ABCDEFG");
- desensitizeDemo.setEmail("1@email.com");
- desensitizeDemo.setRegex("你好，我是芋道源码");
- desensitizeDemo.setAddress("北京市海淀区上地十街10号");
- desensitizeDemo.setOrigin("芋道源码");
-
- // 调用
- DesensitizeDemo d = JsonUtils.parseObject(JsonUtils.toJsonString(desensitizeDemo), DesensitizeDemo.class);
- // 断言
- assertNotNull(d);
- assertEquals("芋***", d.getNickname());
- assertEquals("998800********31", d.getBankCard());
- assertEquals("粤A6***6", d.getCarLicense());
- assertEquals("0108*****22", d.getFixedPhone());
- assertEquals("530321**********11", d.getIdCard());
- assertEquals("******", d.getPassword());
- assertEquals("132****5917", d.getPhoneNumber());
- assertEquals("#######", d.getSlider1());
- assertEquals("ABC*EFG", d.getSlider2());
- assertEquals("*******", d.getSlider3());
- assertEquals("1****@email.com", d.getEmail());
- assertEquals("你好，我是*", d.getRegex());
- assertEquals("北京市海淀区上地十街10号*", d.getAddress());
- assertEquals("芋道源码", d.getOrigin());
- }
-
- @Data
- public static class DesensitizeDemo {
-
- @ChineseNameDesensitize
- private String nickname;
- @BankCardDesensitize
- private String bankCard;
- @CarLicenseDesensitize
- private String carLicense;
- @FixedPhoneDesensitize
- private String fixedPhone;
- @IdCardDesensitize
- private String idCard;
- @PasswordDesensitize
- private String password;
- @MobileDesensitize
- private String phoneNumber;
- @SliderDesensitize(prefixKeep = 6, suffixKeep = 1, replacer = "#")
- private String slider1;
- @SliderDesensitize(prefixKeep = 3, suffixKeep = 3)
- private String slider2;
- @SliderDesensitize(prefixKeep = 10)
- private String slider3;
- @EmailDesensitize
- private String email;
- @RegexDesensitize(regex = "芋道源码", replacer = "*")
- private String regex;
- @Address
- private String address;
- private String origin;
-
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java
deleted file mode 100644
index 735d25b346..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/annotation/Address.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.annotation;
-
-import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest;
-import cn.iocoder.yudao.framework.desensitize.core.base.annotation.DesensitizeBy;
-import cn.iocoder.yudao.framework.desensitize.core.handler.AddressHandler;
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 地址
- *
- * 用于 {@link DesensitizeTest} 测试使用
- *
- * @author gaibu
- */
-@Documented
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@JacksonAnnotationsInside
-@DesensitizeBy(handler = AddressHandler.class)
-public @interface Address {
-
- String replacer() default "*";
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java b/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java
deleted file mode 100644
index 7a8455f8d1..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-desensitize/src/test/java/cn/iocoder/yudao/framework/desensitize/core/handler/AddressHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.framework.desensitize.core.handler;
-
-import cn.iocoder.yudao.framework.desensitize.core.DesensitizeTest;
-import cn.iocoder.yudao.framework.desensitize.core.base.handler.DesensitizationHandler;
-import cn.iocoder.yudao.framework.desensitize.core.annotation.Address;
-
-/**
- * {@link Address} 的脱敏处理器
- *
- * 用于 {@link DesensitizeTest} 测试使用
- */
-public class AddressHandler implements DesensitizationHandler {
-
- @Override
- public String desensitize(String origin, Address annotation) {
- return origin + annotation.replacer();
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-file/pom.xml b/yudao-framework/yudao-spring-boot-starter-file/pom.xml
index 5ce48a857f..93fad220b5 100644
--- a/yudao-framework/yudao-spring-boot-starter-file/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-file/pom.xml
@@ -72,12 +72,6 @@
minio
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
- test
-
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java
deleted file mode 100644
index 113f3e5e5f..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/config/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位，避免 package 无法提交到 Git 仓库
- */
-package cn.iocoder.yudao.framework.file.config;
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java
deleted file mode 100644
index 619e52db88..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClientTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.framework.file.core.client.ftp;
-
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.extra.ftp.FtpMode;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-public class FtpFileClientTest {
-
- @Test
- @Disabled
- public void test() {
- // 创建客户端
- FtpFileClientConfig config = new FtpFileClientConfig();
- config.setDomain("http://127.0.0.1:48080");
- config.setBasePath("/home/ftp");
- config.setHost("kanchai.club");
- config.setPort(221);
- config.setUsername("");
- config.setPassword("");
- config.setMode(FtpMode.Passive.name());
- FtpFileClient client = new FtpFileClient(0L, config);
- client.init();
- // 上传文件
- String path = IdUtil.fastSimpleUUID() + ".jpg";
- byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
- String fullPath = client.upload(content, path, "image/jpeg");
- System.out.println("访问地址：" + fullPath);
- if (false) {
- byte[] bytes = client.getContent(path);
- System.out.println("文件内容：" + bytes);
- }
- if (false) {
- client.delete(path);
- }
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java
deleted file mode 100644
index d48609bc6c..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/local/LocalFileClientTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.framework.file.core.client.local;
-
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.IdUtil;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-public class LocalFileClientTest {
-
- @Test
- @Disabled
- public void test() {
- // 创建客户端
- LocalFileClientConfig config = new LocalFileClientConfig();
- config.setDomain("http://127.0.0.1:48080");
- config.setBasePath("/Users/yunai/file_test");
- LocalFileClient client = new LocalFileClient(0L, config);
- client.init();
- // 上传文件
- String path = IdUtil.fastSimpleUUID() + ".jpg";
- byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
- String fullPath = client.upload(content, path, "image/jpeg");
- System.out.println("访问地址：" + fullPath);
- client.delete(path);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java
deleted file mode 100644
index cbd41ab3e0..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/s3/S3FileClientTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package cn.iocoder.yudao.framework.file.core.client.s3;
-
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import jakarta.validation.Validation;
-
-public class S3FileClientTest {
-
- @Test
- @Disabled // MinIO，如果要集成测试，可以注释本行
- public void testMinIO() throws Exception {
- S3FileClientConfig config = new S3FileClientConfig();
- // 配置成你自己的
- config.setAccessKey("admin");
- config.setAccessSecret("password");
- config.setBucket("yudaoyuanma");
- config.setDomain(null);
- // 默认 9000 endpoint
- config.setEndpoint("http://127.0.0.1:9000");
-
- // 执行上传
- testExecuteUpload(config);
- }
-
- @Test
- @Disabled // 阿里云 OSS，如果要集成测试，可以注释本行
- public void testAliyun() throws Exception {
- S3FileClientConfig config = new S3FileClientConfig();
- // 配置成你自己的
- config.setAccessKey(System.getenv("ALIYUN_ACCESS_KEY"));
- config.setAccessSecret(System.getenv("ALIYUN_SECRET_KEY"));
- config.setBucket("yunai-aoteman");
- config.setDomain(null); // 如果有自定义域名，则可以设置。http://ali-oss.iocoder.cn
- // 默认北京的 endpoint
- config.setEndpoint("oss-cn-beijing.aliyuncs.com");
-
- // 执行上传
- testExecuteUpload(config);
- }
-
- @Test
- @Disabled // 腾讯云 COS，如果要集成测试，可以注释本行
- public void testQCloud() throws Exception {
- S3FileClientConfig config = new S3FileClientConfig();
- // 配置成你自己的
- config.setAccessKey(System.getenv("QCLOUD_ACCESS_KEY"));
- config.setAccessSecret(System.getenv("QCLOUD_SECRET_KEY"));
- config.setBucket("aoteman-1255880240");
- config.setDomain(null); // 如果有自定义域名，则可以设置。http://tengxun-oss.iocoder.cn
- // 默认上海的 endpoint
- config.setEndpoint("cos.ap-shanghai.myqcloud.com");
-
- // 执行上传
- testExecuteUpload(config);
- }
-
- @Test
- @Disabled // 七牛云存储，如果要集成测试，可以注释本行
- public void testQiniu() throws Exception {
- S3FileClientConfig config = new S3FileClientConfig();
- // 配置成你自己的
-// config.setAccessKey(System.getenv("QINIU_ACCESS_KEY"));
-// config.setAccessSecret(System.getenv("QINIU_SECRET_KEY"));
- config.setAccessKey("b7yvuhBSAGjmtPhMFcn9iMOxUOY_I06cA_p0ZUx8");
- config.setAccessSecret("kXM1l5ia1RvSX3QaOEcwI3RLz3Y2rmNszWonKZtP");
- config.setBucket("ruoyi-vue-pro");
- config.setDomain("http://test.yudao.iocoder.cn"); // 如果有自定义域名，则可以设置。http://static.yudao.iocoder.cn
- // 默认上海的 endpoint
- config.setEndpoint("s3-cn-south-1.qiniucs.com");
-
- // 执行上传
- testExecuteUpload(config);
- }
-
- @Test
- @Disabled // 华为云存储，如果要集成测试，可以注释本行
- public void testHuaweiCloud() throws Exception {
- S3FileClientConfig config = new S3FileClientConfig();
- // 配置成你自己的
-// config.setAccessKey(System.getenv("HUAWEI_CLOUD_ACCESS_KEY"));
-// config.setAccessSecret(System.getenv("HUAWEI_CLOUD_SECRET_KEY"));
- config.setBucket("yudao");
- config.setDomain(null); // 如果有自定义域名，则可以设置。
- // 默认上海的 endpoint
- config.setEndpoint("obs.cn-east-3.myhuaweicloud.com");
-
- // 执行上传
- testExecuteUpload(config);
- }
-
- private void testExecuteUpload(S3FileClientConfig config) throws Exception {
- // 校验配置
- ValidationUtils.validate(Validation.buildDefaultValidatorFactory().getValidator(), config);
- // 创建 Client
- S3FileClient client = new S3FileClient(0L, config);
- client.init();
- // 上传文件
- String path = IdUtil.fastSimpleUUID() + ".jpg";
- byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
- String fullPath = client.upload(content, path, "image/jpeg");
- System.out.println("访问地址：" + fullPath);
- // 读取文件
- if (true) {
- byte[] bytes = client.getContent(path);
- System.out.println("文件内容：" + bytes.length);
- }
- // 删除文件
- if (false) {
- client.delete(path);
- }
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java
deleted file mode 100644
index 4785c0d892..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/client/sftp/SftpFileClientTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.iocoder.yudao.framework.file.core.client.sftp;
-
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.util.IdUtil;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-public class SftpFileClientTest {
-
- @Test
- @Disabled
- public void test() {
- // 创建客户端
- SftpFileClientConfig config = new SftpFileClientConfig();
- config.setDomain("http://127.0.0.1:48080");
- config.setBasePath("/home/ftp");
- config.setHost("kanchai.club");
- config.setPort(222);
- config.setUsername("");
- config.setPassword("");
- SftpFileClient client = new SftpFileClient(0L, config);
- client.init();
- // 上传文件
- String path = IdUtil.fastSimpleUUID() + ".jpg";
- byte[] content = ResourceUtil.readBytes("file/erweima.jpg");
- String fullPath = client.upload(content, path, "image/jpeg");
- System.out.println("访问地址：" + fullPath);
- if (false) {
- byte[] bytes = client.getContent(path);
- System.out.println("文件内容：" + bytes);
- }
- if (false) {
- client.delete(path);
- }
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java b/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java
deleted file mode 100644
index e1da5db239..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-file/src/test/java/cn/iocoder/yudao/framework/file/core/enums/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位，避免 package 无法提交到 Git 仓库
- */
-package cn.iocoder.yudao.framework.file.core.enums;
diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/test/resources/file/erweima.jpg b/yudao-framework/yudao-spring-boot-starter-file/src/test/resources/file/erweima.jpg
deleted file mode 100644
index 1447283cdf..0000000000
Binary files a/yudao-framework/yudao-spring-boot-starter-file/src/test/resources/file/erweima.jpg and /dev/null differ
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/pom.xml b/yudao-framework/yudao-spring-boot-starter-flowable/pom.xml
deleted file mode 100644
index ac24f27aeb..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- yudao-framework
- cn.iocoder.boot
- ${revision}
-
- 4.0.0
-
- yudao-spring-boot-starter-flowable
-
-
-
- cn.iocoder.boot
- yudao-common
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-security
-
-
-
-
- org.flowable
- flowable-spring-boot-starter-process
-
-
- org.flowable
- flowable-spring-boot-starter-actuator
-
-
-
-
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
deleted file mode 100644
index 7c29a64626..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/config/YudaoFlowableConfiguration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.config;
-
-import cn.iocoder.yudao.framework.common.enums.WebFilterOrderEnum;
-import cn.iocoder.yudao.framework.flowable.core.web.FlowableWebFilter;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-@AutoConfiguration
-public class YudaoFlowableConfiguration {
-
- /**
- * 参考 {@link org.flowable.spring.boot.FlowableJobConfiguration} 类，创建对应的 AsyncListenableTaskExecutor Bean
- *
- * 如果不创建，会导致项目启动时，Flowable 报错的问题
- */
- @Bean
- public AsyncListenableTaskExecutor taskExecutor() {
- ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setCorePoolSize(8);
- executor.setMaxPoolSize(8);
- executor.setQueueCapacity(100);
- executor.setThreadNamePrefix("flowable-task-Executor-");
- executor.setAwaitTerminationSeconds(30);
- executor.setWaitForTasksToCompleteOnShutdown(true);
- executor.setAllowCoreThreadTimeOut(true);
- executor.initialize();
- return executor;
- }
-
- /**
- * 配置 flowable Web 过滤器
- */
- @Bean
- public FilterRegistrationBean flowableWebFilter() {
- FilterRegistrationBean registrationBean = new FilterRegistrationBean<>();
- registrationBean.setFilter(new FlowableWebFilter());
- registrationBean.setOrder(WebFilterOrderEnum.FLOWABLE_FILTER);
- return registrationBean;
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/context/FlowableContextHolder.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/context/FlowableContextHolder.java
deleted file mode 100644
index efc6d5340d..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/context/FlowableContextHolder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.context;
-
-import cn.hutool.core.collection.CollUtil;
-import com.alibaba.ttl.TransmittableThreadLocal;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 工作流--用户用到的上下文相关信息
- */
-public class FlowableContextHolder {
-
- private static final ThreadLocal>> ASSIGNEE = new TransmittableThreadLocal<>();
-
- /**
- * 通过流程任务的定义 key ，拿到提前选好的审批人
- * 此方法目的：首次创建流程实例时，数据库中还查询不到 assignee 字段，所以存入上下文中获取
- *
- * @param taskDefinitionKey 流程任务 key
- * @return 审批人 ID 集合
- */
- public static List getAssigneeByTaskDefinitionKey(String taskDefinitionKey) {
- if (CollUtil.isNotEmpty(ASSIGNEE.get())) {
- return ASSIGNEE.get().get(taskDefinitionKey);
- }
- return Collections.emptyList();
- }
-
- /**
- * 存入提前选好的审批人到上下文线程变量中
- *
- * @param assignee 流程任务 key -> 审批人 ID 炅和
- */
- public static void setAssignee(Map> assignee) {
- ASSIGNEE.set(assignee);
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java
deleted file mode 100644
index de8d6279d7..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core;
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/BpmnModelUtils.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/BpmnModelUtils.java
deleted file mode 100644
index 7b23a467a0..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/BpmnModelUtils.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.util;
-
-import cn.hutool.core.collection.CollUtil;
-import org.flowable.bpmn.converter.BpmnXMLConverter;
-import org.flowable.bpmn.model.Process;
-import org.flowable.bpmn.model.*;
-
-import java.util.*;
-
-/**
- * 流程模型转操作工具类
- */
-public class BpmnModelUtils {
-
- /**
- * 根据节点，获取入口连线
- *
- * @param source 起始节点
- * @return 入口连线列表
- */
- public static List getElementIncomingFlows(FlowElement source) {
- if (source instanceof FlowNode) {
- return ((FlowNode) source).getIncomingFlows();
- }
- return new ArrayList<>();
- }
-
- /**
- * 根据节点，获取出口连线
- *
- * @param source 起始节点
- * @return 出口连线列表
- */
- public static List getElementOutgoingFlows(FlowElement source) {
- if (source instanceof FlowNode) {
- return ((FlowNode) source).getOutgoingFlows();
- }
- return new ArrayList<>();
- }
-
- /**
- * 获取流程元素信息
- *
- * @param model bpmnModel 对象
- * @param flowElementId 元素 ID
- * @return 元素信息
- */
- public static FlowElement getFlowElementById(BpmnModel model, String flowElementId) {
- Process process = model.getMainProcess();
- return process.getFlowElement(flowElementId);
- }
-
- /**
- * 获得 BPMN 流程中，指定的元素们
- *
- * @param model
- * @param clazz 指定元素。例如说，{@link UserTask}、{@link Gateway} 等等
- * @return 元素们
- */
- public static List getBpmnModelElements(BpmnModel model, Class clazz) {
- List result = new ArrayList<>();
- model.getProcesses().forEach(process -> {
- process.getFlowElements().forEach(flowElement -> {
- if (flowElement.getClass().isAssignableFrom(clazz)) {
- result.add((T) flowElement);
- }
- });
- });
- return result;
- }
-
- /**
- * 比较 两个bpmnModel 是否相同
- * @param oldModel 老的bpmn model
- * @param newModel 新的bpmn model
- */
- public static boolean equals(BpmnModel oldModel, BpmnModel newModel) {
- // 由于 BpmnModel 未提供 equals 方法，所以只能转成字节数组，进行比较
- return Arrays.equals(getBpmnBytes(oldModel), getBpmnBytes(newModel));
- }
-
- /**
- * 把 bpmnModel 转换成 byte[]
- * @param model bpmnModel
- */
- public static byte[] getBpmnBytes(BpmnModel model) {
- if (model == null) {
- return new byte[0];
- }
- BpmnXMLConverter converter = new BpmnXMLConverter();
- return converter.convertToXML(model);
- }
-
- // ========== 遍历相关的方法 ==========
-
- /**
- * 找到 source 节点之前的所有用户任务节点
- *
- * @param source 起始节点
- * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复
- * @param userTaskList 已找到的用户任务节点
- * @return 用户任务节点 数组
- */
- public static List getPreviousUserTaskList(FlowElement source, Set hasSequenceFlow, List userTaskList) {
- userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList;
- hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow;
- // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代
- if (source instanceof StartEvent && source.getSubProcess() != null) {
- userTaskList = getPreviousUserTaskList(source.getSubProcess(), hasSequenceFlow, userTaskList);
- }
-
- // 根据类型，获取入口连线
- List sequenceFlows = getElementIncomingFlows(source);
- if (sequenceFlows == null) {
- return userTaskList;
- }
- // 循环找到目标元素
- for (SequenceFlow sequenceFlow : sequenceFlows) {
- // 如果发现连线重复，说明循环了，跳过这个循环
- if (hasSequenceFlow.contains(sequenceFlow.getId())) {
- continue;
- }
- // 添加已经走过的连线
- hasSequenceFlow.add(sequenceFlow.getId());
- // 类型为用户节点，则新增父级节点
- if (sequenceFlow.getSourceFlowElement() instanceof UserTask) {
- userTaskList.add((UserTask) sequenceFlow.getSourceFlowElement());
- }
- // 类型为子流程，则添加子流程开始节点出口处相连的节点
- if (sequenceFlow.getSourceFlowElement() instanceof SubProcess) {
- // 获取子流程用户任务节点
- List childUserTaskList = findChildProcessUserTaskList((StartEvent) ((SubProcess) sequenceFlow.getSourceFlowElement()).getFlowElements().toArray()[0], null, null);
- // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续
- if (CollUtil.isNotEmpty(childUserTaskList)) {
- userTaskList.addAll(childUserTaskList);
- }
- }
- // 继续迭代
- userTaskList = getPreviousUserTaskList(sequenceFlow.getSourceFlowElement(), hasSequenceFlow, userTaskList);
- }
- return userTaskList;
- }
-
- /**
- * 迭代获取子流程用户任务节点
- *
- * @param source 起始节点
- * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复
- * @param userTaskList 需要撤回的用户任务列表
- * @return 用户任务节点
- */
- public static List findChildProcessUserTaskList(FlowElement source, Set hasSequenceFlow, List userTaskList) {
- hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow;
- userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList;
-
- // 根据类型，获取出口连线
- List sequenceFlows = getElementOutgoingFlows(source);
- if (sequenceFlows == null) {
- return userTaskList;
- }
- // 循环找到目标元素
- for (SequenceFlow sequenceFlow : sequenceFlows) {
- // 如果发现连线重复，说明循环了，跳过这个循环
- if (hasSequenceFlow.contains(sequenceFlow.getId())) {
- continue;
- }
- // 添加已经走过的连线
- hasSequenceFlow.add(sequenceFlow.getId());
- // 如果为用户任务类型，且任务节点的 Key 正在运行的任务中存在，添加
- if (sequenceFlow.getTargetFlowElement() instanceof UserTask) {
- userTaskList.add((UserTask) sequenceFlow.getTargetFlowElement());
- continue;
- }
- // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取
- if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) {
- List childUserTaskList = findChildProcessUserTaskList((FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements().toArray()[0]), hasSequenceFlow, null);
- // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续
- if (CollUtil.isNotEmpty(childUserTaskList)) {
- userTaskList.addAll(childUserTaskList);
- continue;
- }
- }
- // 继续迭代
- userTaskList = findChildProcessUserTaskList(sequenceFlow.getTargetFlowElement(), hasSequenceFlow, userTaskList);
- }
- return userTaskList;
- }
-
-
- /**
- * 迭代从后向前扫描，判断目标节点相对于当前节点是否是串行
- * 不存在直接回退到子流程中的情况，但存在从子流程出去到父流程情况
- *
- * @param source 起始节点
- * @param target 目标节点
- * @param visitedElements 已经经过的连线的 ID，用于判断线路是否重复
- * @return 结果
- */
- public static boolean isSequentialReachable(FlowElement source, FlowElement target, Set visitedElements) {
- visitedElements = visitedElements == null ? new HashSet<>() : visitedElements;
- // 不能是开始事件和子流程
- if (source instanceof StartEvent && isInEventSubprocess(source)) {
- return false;
- }
-
- // 根据类型，获取入口连线
- List sequenceFlows = getElementIncomingFlows(source);
- if (CollUtil.isEmpty(sequenceFlows)) {
- return true;
- }
- // 循环找到目标元素
- for (SequenceFlow sequenceFlow : sequenceFlows) {
- // 如果发现连线重复，说明循环了，跳过这个循环
- if (visitedElements.contains(sequenceFlow.getId())) {
- continue;
- }
- // 添加已经走过的连线
- visitedElements.add(sequenceFlow.getId());
- // 这条线路存在目标节点，这条线路完成，进入下个线路
- FlowElement sourceFlowElement = sequenceFlow.getSourceFlowElement();
- if (target.getId().equals(sourceFlowElement.getId())) {
- continue;
- }
- // 如果目标节点为并行网关，则不继续
- if (sourceFlowElement instanceof ParallelGateway) {
- return false;
- }
- // 否则就继续迭代
- if (!isSequentialReachable(sourceFlowElement, target, visitedElements)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 判断当前节点是否属于不同的子流程
- *
- * @param flowElement 被判断的节点
- * @return true 表示属于子流程
- */
- private static boolean isInEventSubprocess(FlowElement flowElement) {
- FlowElementsContainer flowElementsContainer = flowElement.getParentContainer();
- while (flowElementsContainer != null) {
- if (flowElementsContainer instanceof EventSubProcess) {
- return true;
- }
-
- if (flowElementsContainer instanceof FlowElement) {
- flowElementsContainer = ((FlowElement) flowElementsContainer).getParentContainer();
- } else {
- flowElementsContainer = null;
- }
- }
- return false;
- }
-
- /**
- * 根据正在运行的任务节点，迭代获取子级任务节点列表，向后找
- *
- * @param source 起始节点
- * @param runTaskKeyList 正在运行的任务 Key，用于校验任务节点是否是正在运行的节点
- * @param hasSequenceFlow 已经经过的连线的 ID，用于判断线路是否重复
- * @param userTaskList 需要撤回的用户任务列表
- * @return 子级任务节点列表
- */
- public static List iteratorFindChildUserTasks(FlowElement source, List runTaskKeyList,
- Set hasSequenceFlow, List userTaskList) {
- hasSequenceFlow = hasSequenceFlow == null ? new HashSet<>() : hasSequenceFlow;
- userTaskList = userTaskList == null ? new ArrayList<>() : userTaskList;
- // 如果该节点为开始节点，且存在上级子节点，则顺着上级子节点继续迭代
- if (source instanceof StartEvent && source.getSubProcess() != null) {
- userTaskList = iteratorFindChildUserTasks(source.getSubProcess(), runTaskKeyList, hasSequenceFlow, userTaskList);
- }
-
- // 根据类型，获取出口连线
- List sequenceFlows = getElementOutgoingFlows(source);
- if (sequenceFlows == null) {
- return userTaskList;
- }
- // 循环找到目标元素
- for (SequenceFlow sequenceFlow : sequenceFlows) {
- // 如果发现连线重复，说明循环了，跳过这个循环
- if (hasSequenceFlow.contains(sequenceFlow.getId())) {
- continue;
- }
- // 添加已经走过的连线
- hasSequenceFlow.add(sequenceFlow.getId());
- // 如果为用户任务类型，且任务节点的 Key 正在运行的任务中存在，添加
- if (sequenceFlow.getTargetFlowElement() instanceof UserTask && runTaskKeyList.contains((sequenceFlow.getTargetFlowElement()).getId())) {
- userTaskList.add((UserTask) sequenceFlow.getTargetFlowElement());
- continue;
- }
- // 如果节点为子流程节点情况，则从节点中的第一个节点开始获取
- if (sequenceFlow.getTargetFlowElement() instanceof SubProcess) {
- List childUserTaskList = iteratorFindChildUserTasks((FlowElement) (((SubProcess) sequenceFlow.getTargetFlowElement()).getFlowElements().toArray()[0]), runTaskKeyList, hasSequenceFlow, null);
- // 如果找到节点，则说明该线路找到节点，不继续向下找，反之继续
- if (CollUtil.isNotEmpty(childUserTaskList)) {
- userTaskList.addAll(childUserTaskList);
- continue;
- }
- }
- // 继续迭代
- userTaskList = iteratorFindChildUserTasks(sequenceFlow.getTargetFlowElement(), runTaskKeyList, hasSequenceFlow, userTaskList);
- }
- return userTaskList;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java
deleted file mode 100644
index 2a0fc38ac5..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/util/FlowableUtils.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.util;
-
-import org.flowable.common.engine.impl.identity.Authentication;
-
-/**
- * Flowable 相关的工具方法
- *
- * @author 芋道源码
- */
-public class FlowableUtils {
-
- // ========== User 相关的工具方法 ==========
-
- public static void setAuthenticatedUserId(Long userId) {
- Authentication.setAuthenticatedUserId(String.valueOf(userId));
- }
-
- public static void clearAuthenticatedUserId() {
- Authentication.setAuthenticatedUserId(null);
- }
-
- // ========== Execution 相关的工具方法 ==========
-
- public static String formatCollectionVariable(String activityId) {
- return activityId + "_assignees";
- }
-
- public static String formatCollectionElementVariable(String activityId) {
- return activityId + "_assignee";
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java
deleted file mode 100644
index d2135290fd..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/core/web/FlowableWebFilter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.framework.flowable.core.web;
-
-import cn.iocoder.yudao.framework.flowable.core.util.FlowableUtils;
-import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
-/**
- * flowable Web 过滤器，将 userId 设置到 {@link org.flowable.common.engine.impl.identity.Authentication} 中
- *
- * @author jason
- */
-public class FlowableWebFilter extends OncePerRequestFilter {
-
- @Override
- protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
- throws ServletException, IOException {
- try {
- // 设置工作流的用户
- Long userId = SecurityFrameworkUtils.getLoginUserId();
- if (userId != null) {
- FlowableUtils.setAuthenticatedUserId(userId);
- }
- // 过滤
- chain.doFilter(request, response);
- } finally {
- // 清理
- FlowableUtils.clearAuthenticatedUserId();
- }
- }
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java
deleted file mode 100644
index 324d3de0ec..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/java/cn/iocoder/yudao/framework/flowable/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.iocoder.yudao.framework.flowable;
diff --git a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 1df61598ce..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-flowable/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration
\ No newline at end of file
diff --git a/yudao-framework/yudao-spring-boot-starter-test/pom.xml b/yudao-framework/yudao-spring-boot-starter-test/pom.xml
deleted file mode 100644
index 04576fee6c..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- cn.iocoder.boot
- yudao-framework
- ${revision}
-
- 4.0.0
- yudao-spring-boot-starter-test
- jar
-
- ${project.artifactId}
- 测试组件，用于单元测试、集成测试
- https://github.com/YunaiV/ruoyi-vue-pro
-
-
-
- cn.iocoder.boot
- yudao-common
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-mybatis
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-redis
-
-
-
-
- org.mockito
- mockito-inline
-
-
- org.springframework.boot
- spring-boot-starter-test
-
-
-
- com.h2database
- h2
-
-
-
- com.github.fppt
- jedis-mock
-
-
-
- uk.co.jemos.podam
- podam
-
-
-
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java
deleted file mode 100644
index 46222911e9..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/RedisTestConfiguration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.framework.test.config;
-
-import com.github.fppt.jedismock.RedisServer;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-import java.io.IOException;
-
-/**
- * Redis 测试 Configuration，主要实现内嵌 Redis 的启动
- *
- * @author 芋道源码
- */
-@Configuration(proxyBeanMethods = false)
-@Lazy(false) // 禁止延迟加载
-@EnableConfigurationProperties(RedisProperties.class)
-public class RedisTestConfiguration {
-
- /**
- * 创建模拟的 Redis Server 服务器
- */
- @Bean
- public RedisServer redisServer(RedisProperties properties) throws IOException {
- RedisServer redisServer = new RedisServer(properties.getPort());
- // 一次执行多个单元测试时，貌似创建多个 spring 容器，导致不进行 stop。这样，就导致端口被占用，无法启动。。。
- try {
- redisServer.start();
- } catch (Exception ignore) {}
- return redisServer;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java
deleted file mode 100644
index abaec9d84f..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/config/SqlInitializationTestConfiguration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.iocoder.yudao.framework.test.config;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
-import org.springframework.boot.autoconfigure.sql.init.SqlInitializationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
-import org.springframework.boot.sql.init.AbstractScriptDatabaseInitializer;
-import org.springframework.boot.sql.init.DatabaseInitializationSettings;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-import javax.sql.DataSource;
-
-/**
- * SQL 初始化的测试 Configuration
- *
- * 为什么不使用 org.springframework.boot.autoconfigure.sql.init.DataSourceInitializationConfiguration 呢？
- * 因为我们在单元测试会使用 spring.main.lazy-initialization 为 true，开启延迟加载。此时，会导致 DataSourceInitializationConfiguration 初始化
- * 不过呢，当前类的实现代码，基本是复制 DataSourceInitializationConfiguration 的哈！
- *
- * @author 芋道源码
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnMissingBean(AbstractScriptDatabaseInitializer.class)
-@ConditionalOnSingleCandidate(DataSource.class)
-@ConditionalOnClass(name = "org.springframework.jdbc.datasource.init.DatabasePopulator")
-@Lazy(value = false) // 禁止延迟加载
-@EnableConfigurationProperties(SqlInitializationProperties.class)
-public class SqlInitializationTestConfiguration {
-
- @Bean
- public DataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSource dataSource,
- SqlInitializationProperties initializationProperties) {
- DatabaseInitializationSettings settings = createFrom(initializationProperties);
- return new DataSourceScriptDatabaseInitializer(dataSource, settings);
- }
-
- static DatabaseInitializationSettings createFrom(SqlInitializationProperties properties) {
- DatabaseInitializationSettings settings = new DatabaseInitializationSettings();
- settings.setSchemaLocations(properties.getSchemaLocations());
- settings.setDataLocations(properties.getDataLocations());
- settings.setContinueOnError(properties.isContinueOnError());
- settings.setSeparator(properties.getSeparator());
- settings.setEncoding(properties.getEncoding());
- settings.setMode(properties.getMode());
- return settings;
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java
deleted file mode 100644
index 71f1db5537..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbAndRedisUnitTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.ut;
-
-import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
-import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
-import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
-import cn.iocoder.yudao.framework.test.config.RedisTestConfiguration;
-import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration;
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
-import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
-import org.redisson.spring.starter.RedissonAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.jdbc.Sql;
-
-/**
- * 依赖内存 DB + Redis 的单元测试
- *
- * 相比 {@link BaseDbUnitTest} 来说，额外增加了内存 Redis
- *
- * @author 芋道源码
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseDbAndRedisUnitTest.Application.class)
-@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
-@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB
-public class BaseDbAndRedisUnitTest {
-
- @Import({
- // DB 配置类
- YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类
- DataSourceAutoConfiguration.class, // Spring DB 自动配置类
- DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类
- DruidDataSourceAutoConfigure.class, // Druid 自动配置类
- SqlInitializationTestConfiguration.class, // SQL 初始化
- // MyBatis 配置类
- YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
- MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
-
- // Redis 配置类
- RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer
- YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类
- RedisAutoConfiguration.class, // Spring Redis 自动配置类
- RedissonAutoConfiguration.class, // Redisson 自动高配置类
- })
- public static class Application {
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java
deleted file mode 100644
index ee43fcb43b..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseDbUnitTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.ut;
-
-import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
-import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
-import cn.iocoder.yudao.framework.test.config.SqlInitializationTestConfiguration;
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
-import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
-import com.github.yulichang.autoconfigure.MybatisPlusJoinAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.jdbc.Sql;
-
-/**
- * 依赖内存 DB 的单元测试
- *
- * 注意，Service 层同样适用。对于 Service 层的单元测试，我们针对自己模块的 Mapper 走的是 H2 内存数据库，针对别的模块的 Service 走的是 Mock 方法
- *
- * @author 芋道源码
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseDbUnitTest.Application.class)
-@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
-@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD) // 每个单元测试结束后，清理 DB
-public class BaseDbUnitTest {
-
- @Import({
- // DB 配置类
- YudaoDataSourceAutoConfiguration.class, // 自己的 DB 配置类
- DataSourceAutoConfiguration.class, // Spring DB 自动配置类
- DataSourceTransactionManagerAutoConfiguration.class, // Spring 事务自动配置类
- DruidDataSourceAutoConfigure.class, // Druid 自动配置类
- SqlInitializationTestConfiguration.class, // SQL 初始化
- // MyBatis 配置类
- YudaoMybatisAutoConfiguration.class, // 自己的 MyBatis 配置类
- MybatisPlusAutoConfiguration.class, // MyBatis 的自动配置类
- MybatisPlusJoinAutoConfiguration.class, // MyBatis 的Join配置类
- })
- public static class Application {
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java
deleted file mode 100644
index 26048695c5..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseMockitoUnitTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.ut;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-/**
- * 纯 Mockito 的单元测试
- *
- * @author 芋道源码
- */
-@ExtendWith(MockitoExtension.class)
-public class BaseMockitoUnitTest {
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java
deleted file mode 100644
index 7a112e05d3..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/BaseRedisUnitTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.ut;
-
-import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
-import cn.iocoder.yudao.framework.test.config.RedisTestConfiguration;
-import org.redisson.spring.starter.RedissonAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.ActiveProfiles;
-
-/**
- * 依赖内存 Redis 的单元测试
- *
- * 相比 {@link BaseDbUnitTest} 来说，从内存 DB 改成了内存 Redis
- *
- * @author 芋道源码
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = BaseRedisUnitTest.Application.class)
-@ActiveProfiles("unit-test") // 设置使用 application-unit-test 配置文件
-public class BaseRedisUnitTest {
-
- @Import({
- // Redis 配置类
- RedisTestConfiguration.class, // Redis 测试配置类，用于启动 RedisServer
- RedisAutoConfiguration.class, // Spring Redis 自动配置类
- YudaoRedisAutoConfiguration.class, // 自己的 Redis 配置类
- RedissonAutoConfiguration.class, // Redisson 自动高配置类
- })
- public static class Application {
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java
deleted file mode 100644
index bda7aad252..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/ut/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 提供单元测试 Unit Test 的基类
- */
-package cn.iocoder.yudao.framework.test.core.ut;
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java
deleted file mode 100644
index e98f4980fc..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/AssertUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.util;
-
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ReflectUtil;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.exception.ServiceException;
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.function.Executable;
-
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Objects;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-/**
- * 单元测试，assert 断言工具类
- *
- * @author 芋道源码
- */
-public class AssertUtils {
-
- /**
- * 比对两个对象的属性是否一致
- *
- * 注意，如果 expected 存在的属性，actual 不存在的时候，会进行忽略
- *
- * @param expected 期望对象
- * @param actual 实际对象
- * @param ignoreFields 忽略的属性数组
- */
- public static void assertPojoEquals(Object expected, Object actual, String... ignoreFields) {
- Field[] expectedFields = ReflectUtil.getFields(expected.getClass());
- Arrays.stream(expectedFields).forEach(expectedField -> {
- // 忽略 jacoco 自动生成的 $jacocoData 属性的情况
- if (expectedField.isSynthetic()) {
- return;
- }
- // 如果是忽略的属性，则不进行比对
- if (ArrayUtil.contains(ignoreFields, expectedField.getName())) {
- return;
- }
- // 忽略不存在的属性
- Field actualField = ReflectUtil.getField(actual.getClass(), expectedField.getName());
- if (actualField == null) {
- return;
- }
- // 比对
- Assertions.assertEquals(
- ReflectUtil.getFieldValue(expected, expectedField),
- ReflectUtil.getFieldValue(actual, actualField),
- String.format("Field(%s) 不匹配", expectedField.getName())
- );
- });
- }
-
- /**
- * 比对两个对象的属性是否一致
- *
- * 注意，如果 expected 存在的属性，actual 不存在的时候，会进行忽略
- *
- * @param expected 期望对象
- * @param actual 实际对象
- * @param ignoreFields 忽略的属性数组
- * @return 是否一致
- */
- public static boolean isPojoEquals(Object expected, Object actual, String... ignoreFields) {
- Field[] expectedFields = ReflectUtil.getFields(expected.getClass());
- return Arrays.stream(expectedFields).allMatch(expectedField -> {
- // 如果是忽略的属性，则不进行比对
- if (ArrayUtil.contains(ignoreFields, expectedField.getName())) {
- return true;
- }
- // 忽略不存在的属性
- Field actualField = ReflectUtil.getField(actual.getClass(), expectedField.getName());
- if (actualField == null) {
- return true;
- }
- return Objects.equals(ReflectUtil.getFieldValue(expected, expectedField),
- ReflectUtil.getFieldValue(actual, actualField));
- });
- }
-
- /**
- * 执行方法，校验抛出的 Service 是否符合条件
- *
- * @param executable 业务异常
- * @param errorCode 错误码对象
- * @param messageParams 消息参数
- */
- public static void assertServiceException(Executable executable, ErrorCode errorCode, Object... messageParams) {
- // 调用方法
- ServiceException serviceException = assertThrows(ServiceException.class, executable);
- // 校验错误码
- Assertions.assertEquals(errorCode.getCode(), serviceException.getCode(), "错误码不匹配");
- String message = ServiceExceptionUtil.doFormat(errorCode.getCode(), errorCode.getMsg(), messageParams);
- Assertions.assertEquals(message, serviceException.getMessage(), "错误提示不匹配");
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
deleted file mode 100644
index 66d15c5bfa..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/core/util/RandomUtils.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package cn.iocoder.yudao.framework.test.core.util;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import uk.co.jemos.podam.api.PodamFactory;
-import uk.co.jemos.podam.api.PodamFactoryImpl;
-
-import java.lang.reflect.Type;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * 随机工具类
- *
- * @author 芋道源码
- */
-public class RandomUtils {
-
- private static final int RANDOM_STRING_LENGTH = 10;
-
- private static final int TINYINT_MAX = 127;
-
- private static final int RANDOM_DATE_MAX = 30;
-
- private static final int RANDOM_COLLECTION_LENGTH = 5;
-
- private static final PodamFactory PODAM_FACTORY = new PodamFactoryImpl();
-
- static {
- // 字符串
- PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(String.class,
- (dataProviderStrategy, attributeMetadata, map) -> randomString());
- // Integer
- PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Integer.class, (dataProviderStrategy, attributeMetadata, map) -> {
- // 如果是 status 的字段，返回 0 或 1
- if ("status".equals(attributeMetadata.getAttributeName())) {
- return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus();
- }
- // 如果是 type、status 结尾的字段，返回 tinyint 范围
- if (StrUtil.endWithAnyIgnoreCase(attributeMetadata.getAttributeName(),
- "type", "status", "category", "scope", "result")) {
- return RandomUtil.randomInt(0, TINYINT_MAX + 1);
- }
- return RandomUtil.randomInt();
- });
- // LocalDateTime
- PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(LocalDateTime.class,
- (dataProviderStrategy, attributeMetadata, map) -> randomLocalDateTime());
- // Boolean
- PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> {
- // 如果是 deleted 的字段，返回非删除
- if ("deleted".equals(attributeMetadata.getAttributeName())) {
- return false;
- }
- return RandomUtil.randomBoolean();
- });
- }
-
- public static String randomString() {
- return RandomUtil.randomString(RANDOM_STRING_LENGTH);
- }
-
- public static Long randomLongId() {
- return RandomUtil.randomLong(0, Long.MAX_VALUE);
- }
-
- public static Integer randomInteger() {
- return RandomUtil.randomInt(0, Integer.MAX_VALUE);
- }
-
- public static Date randomDate() {
- return RandomUtil.randomDay(0, RANDOM_DATE_MAX);
- }
-
- public static LocalDateTime randomLocalDateTime() {
- // 设置 Nano 为零的原因，避免 MySQL、H2 存储不到时间戳
- return LocalDateTimeUtil.of(randomDate()).withNano(0);
- }
-
- public static Short randomShort() {
- return (short) RandomUtil.randomInt(0, Short.MAX_VALUE);
- }
-
- public static Set randomSet(Class clazz) {
- return Stream.iterate(0, i -> i).limit(RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH))
- .map(i -> randomPojo(clazz)).collect(Collectors.toSet());
- }
-
- public static Integer randomCommonStatus() {
- return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus();
- }
-
- public static String randomEmail() {
- return randomString() + "@qq.com";
- }
-
- public static String randomURL() {
- return "https://www.iocoder.cn/" + randomString();
- }
-
- @SafeVarargs
- public static T randomPojo(Class clazz, Consumer... consumers) {
- T pojo = PODAM_FACTORY.manufacturePojo(clazz);
- // 非空时，回调逻辑。通过它，可以实现 Pojo 的进一步处理
- if (ArrayUtil.isNotEmpty(consumers)) {
- Arrays.stream(consumers).forEach(consumer -> consumer.accept(pojo));
- }
- return pojo;
- }
-
- @SafeVarargs
- public static T randomPojo(Class clazz, Type type, Consumer... consumers) {
- T pojo = PODAM_FACTORY.manufacturePojo(clazz, type);
- // 非空时，回调逻辑。通过它，可以实现 Pojo 的进一步处理
- if (ArrayUtil.isNotEmpty(consumers)) {
- Arrays.stream(consumers).forEach(consumer -> consumer.accept(pojo));
- }
- return pojo;
- }
-
- @SafeVarargs
- public static List randomPojoList(Class clazz, Consumer... consumers) {
- int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH);
- return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers))
- .collect(Collectors.toList());
- }
-
-}
diff --git a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java b/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java
deleted file mode 100644
index 3a17f51900..0000000000
--- a/yudao-framework/yudao-spring-boot-starter-test/src/main/java/cn/iocoder/yudao/framework/test/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 测试组件，用于单元测试、集成测试等等
- */
-package cn.iocoder.yudao.framework.test;
diff --git "a/yudao-framework/yudao-spring-boot-starter-test/\343\200\212\350\212\213\351\201\223 Spring Boot \345\215\225\345\205\203\346\265\213\350\257\225 Test \345\205\245\351\227\250\343\200\213.md" "b/yudao-framework/yudao-spring-boot-starter-test/\343\200\212\350\212\213\351\201\223 Spring Boot \345\215\225\345\205\203\346\265\213\350\257\225 Test \345\205\245\351\227\250\343\200\213.md"
deleted file mode 100644
index c6d0e9a905..0000000000
--- "a/yudao-framework/yudao-spring-boot-starter-test/\343\200\212\350\212\213\351\201\223 Spring Boot \345\215\225\345\205\203\346\265\213\350\257\225 Test \345\205\245\351\227\250\343\200\213.md"
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/yudao-module-bpm/pom.xml b/yudao-module-bpm/pom.xml
deleted file mode 100644
index 95b798904c..0000000000
--- a/yudao-module-bpm/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- yudao
- cn.iocoder.boot
- ${revision}
-
- 4.0.0
-
- yudao-module-bpm-api
- yudao-module-bpm-biz
-
- yudao-module-bpm
- pom
-
- ${project.artifactId}
-
- bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。
- 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
- bpm 解释：https://baike.baidu.com/item/BPM/1933
-
- 工作流基于 Flowable 6 实现，分成流程定义、流程表单、流程实例、流程任务等功能模块。
-
-
-
diff --git a/yudao-module-bpm/yudao-module-bpm-api/pom.xml b/yudao-module-bpm/yudao-module-bpm-api/pom.xml
deleted file mode 100644
index 06554d7ff0..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- cn.iocoder.boot
- yudao-module-bpm
- ${revision}
-
- 4.0.0
- yudao-module-bpm-api
- jar
-
- ${project.artifactId}
-
- bpm 模块 API，暴露给其它模块调用
-
-
-
-
- cn.iocoder.boot
- yudao-common
-
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
- true
-
-
-
-
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java
deleted file mode 100644
index 37a92219f9..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * bpm API 包，定义暴露给其它模块的 API
- */
-package cn.iocoder.yudao.module.bpm.api;
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
deleted file mode 100644
index e4eddf6ebd..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.task;
-
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-
-import jakarta.validation.Valid;
-
-/**
- * 流程实例 Api 接口
- *
- * @author 芋道源码
- */
-public interface BpmProcessInstanceApi {
-
- /**
- * 创建流程实例（提供给内部）
- *
- * @param userId 用户编号
- * @param reqDTO 创建信息
- * @return 实例的编号
- */
- String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO);
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java
deleted file mode 100644
index b20a449df5..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.task.dto;
-
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程实例的创建 Request DTO
- *
- * @author 芋道源码
- */
-@Data
-public class BpmProcessInstanceCreateReqDTO {
-
- /**
- * 流程定义的标识
- */
- @NotEmpty(message = "流程定义的标识不能为空")
- private String processDefinitionKey;
- /**
- * 变量实例
- */
- private Map variables;
-
- /**
- * 业务的唯一标识
- *
- * 例如说，请假申请的编号。通过它，可以查询到对应的实例
- */
- @NotEmpty(message = "业务的唯一标识")
- private String businessKey;
-
- // TODO @hai：assignees 复数
- /**
- * 提前指派的审批人
- *
- * key：taskKey 任务编码
- * value：审批人的数组
- * 例如： { taskKey1 :[1, 2] }，则表示 taskKey1 这个任务，提前设定了，由 userId 为 1,2 的用户进行审批
- */
- private Map> assignee;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
deleted file mode 100644
index 7abb3e1dbc..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/DictTypeConstants.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums;
-
-/**
- * BPM 字典类型的枚举类
- *
- * @author 芋道源码
- */
-public interface DictTypeConstants {
-
- String TASK_ASSIGN_RULE_TYPE = "bpm_task_assign_rule_type"; // 任务分配规则类型
- String TASK_ASSIGN_SCRIPT = "bpm_task_assign_script"; // 任务分配自定义脚本
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
deleted file mode 100644
index 51eebda236..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-
-/**
- * Bpm 错误码枚举类
- *
- * bpm 系统，使用 1-009-000-000 段
- */
-public interface ErrorCodeConstants {
-
- // ========== 通用流程处理 模块 1-009-000-000 ==========
- ErrorCode HIGHLIGHT_IMG_ERROR = new ErrorCode(1_009_000_002, "获取高亮流程图异常");
-
- // ========== OA 流程模块 1-009-001-000 ==========
- ErrorCode OA_LEAVE_NOT_EXISTS = new ErrorCode(1_009_001_001, "请假申请不存在");
- ErrorCode OA_PM_POST_NOT_EXISTS = new ErrorCode(1_009_001_002, "项目经理岗位未设置");
- ErrorCode OA_DEPART_PM_POST_NOT_EXISTS = new ErrorCode(1_009_001_009, "部门的项目经理不存在");
- ErrorCode OA_BM_POST_NOT_EXISTS = new ErrorCode(1_009_001_004, "部门经理岗位未设置");
- ErrorCode OA_DEPART_BM_POST_NOT_EXISTS = new ErrorCode(1_009_001_005, "部门的部门经理不存在");
- ErrorCode OA_HR_POST_NOT_EXISTS = new ErrorCode(1_009_001_006, "HR岗位未设置");
- ErrorCode OA_DAY_LEAVE_ERROR = new ErrorCode(1_009_001_007, "请假天数必须>=1");
-
- // ========== 流程模型 1-009-002-000 ==========
- ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");
- ErrorCode MODEL_NOT_EXISTS = new ErrorCode(1_009_002_001, "流程模型不存在");
- ErrorCode MODEL_KEY_VALID = new ErrorCode(1_009_002_002, "流程标识格式不正确，需要以字母或下划线开头，后接任意字母、数字、中划线、下划线、句点！");
- ErrorCode MODEL_DEPLOY_FAIL_FORM_NOT_CONFIG = new ErrorCode(1_009_002_003, "部署流程失败，原因：流程表单未配置，请点击【修改流程】按钮进行配置");
- ErrorCode MODEL_DEPLOY_FAIL_TASK_ASSIGN_RULE_NOT_CONFIG = new ErrorCode(1_009_002_004, "部署流程失败，" +
- "原因：用户任务({})未配置分配规则，请点击【修改流程】按钮进行配置");
- ErrorCode MODEL_DEPLOY_FAIL_TASK_INFO_EQUALS = new ErrorCode(1_009_003_005, "流程定义部署失败，原因：信息未发生变化");
-
- // ========== 流程定义 1-009-003-000 ==========
- ErrorCode PROCESS_DEFINITION_KEY_NOT_MATCH = new ErrorCode(1_009_003_000, "流程定义的标识期望是({})，当前是({})，请修改 BPMN 流程图");
- ErrorCode PROCESS_DEFINITION_NAME_NOT_MATCH = new ErrorCode(1_009_003_001, "流程定义的名字期望是({})，当前是({})，请修改 BPMN 流程图");
- ErrorCode PROCESS_DEFINITION_NOT_EXISTS = new ErrorCode(1_009_003_002, "流程定义不存在");
- ErrorCode PROCESS_DEFINITION_IS_SUSPENDED = new ErrorCode(1_009_003_003, "流程定义处于挂起状态");
- ErrorCode PROCESS_DEFINITION_BPMN_MODEL_NOT_EXISTS = new ErrorCode(1_009_003_004, "流程定义的模型不存在");
-
- // ========== 流程实例 1-009-004-000 ==========
- ErrorCode PROCESS_INSTANCE_NOT_EXISTS = new ErrorCode(1_009_004_000, "流程实例不存在");
- ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS = new ErrorCode(1_009_004_001, "流程取消失败，流程不处于运行中");
- ErrorCode PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF = new ErrorCode(1_009_004_002, "流程取消失败，该流程不是你发起的");
-
- // ========== 流程任务 1-009-005-000 ==========
- ErrorCode TASK_OPERATE_FAIL_ASSIGN_NOT_SELF = new ErrorCode(1_009_005_001, "操作失败，原因：该任务的审批人不是你");
- ErrorCode TASK_NOT_EXISTS = new ErrorCode(1_009_005_002, "流程任务不存在");
- ErrorCode TASK_IS_PENDING = new ErrorCode(1_009_005_003, "当前任务处于挂起状态，不能操作");
- ErrorCode TASK_TARGET_NODE_NOT_EXISTS = new ErrorCode(1_009_005_004, " 目标节点不存在");
- ErrorCode TASK_RETURN_FAIL_SOURCE_TARGET_ERROR = new ErrorCode(1_009_005_006, "回退任务失败，目标节点是在并行网关上或非同一路线上，不可跳转");
- ErrorCode TASK_DELEGATE_FAIL_USER_REPEAT = new ErrorCode(1_009_005_007, "任务委派失败，委派人和当前审批人为同一人");
- ErrorCode TASK_DELEGATE_FAIL_USER_NOT_EXISTS = new ErrorCode(1_009_005_008, "任务委派失败，被委派人不存在");
- ErrorCode TASK_ADD_SIGN_USER_NOT_EXIST = new ErrorCode(1_009_005_009, "任务加签：选择的用户不存在");
- ErrorCode TASK_ADD_SIGN_TYPE_ERROR = new ErrorCode(1_009_005_010, "任务加签：当前任务已经{}，不能{}");
- ErrorCode TASK_ADD_SIGN_USER_REPEAT = new ErrorCode(1_009_005_011, "任务加签失败，加签人与现有审批人[{}]重复");
- ErrorCode TASK_SUB_SIGN_NO_PARENT = new ErrorCode(1_009_005_011, "任务减签失败，被减签的任务必须是通过加签生成的任务");
-
- // ========== 流程任务分配规则 1-009-006-000 ==========
- ErrorCode TASK_ASSIGN_RULE_EXISTS = new ErrorCode(1_009_006_000, "流程({}) 的任务({}) 已经存在分配规则");
- ErrorCode TASK_ASSIGN_RULE_NOT_EXISTS = new ErrorCode(1_009_006_001, "流程任务分配规则不存在");
- ErrorCode TASK_UPDATE_FAIL_NOT_MODEL = new ErrorCode(1_009_006_002, "只有流程模型的任务分配规则，才允许被修改");
- ErrorCode TASK_CREATE_FAIL_NO_CANDIDATE_USER = new ErrorCode(1_009_006_003, "操作失败，原因：找不到任务的审批人！");
- ErrorCode TASK_ASSIGN_SCRIPT_NOT_EXISTS = new ErrorCode(1_009_006_004, "操作失败，原因：任务分配脚本({}) 不存在");
-
- // ========== 动态表单模块 1-009-010-000 ==========
- ErrorCode FORM_NOT_EXISTS = new ErrorCode(1_009_010_000, "动态表单不存在");
- ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1_009_010_001, "表单项({}) 和 ({}) 使用了相同的字段名({})");
-
- // ========== 用户组模块 1-009-011-000 ==========
- ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1_009_011_000, "用户组不存在");
- ErrorCode USER_GROUP_IS_DISABLE = new ErrorCode(1_009_011_001, "名字为【{}】的用户组已被禁用");
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java
deleted file mode 100644
index c21d6f9991..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.definition;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM 模型的表单类型的枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum BpmModelFormTypeEnum {
-
- NORMAL(10, "流程表单"), // 对应 BpmFormDO
- CUSTOM(20, "业务表单") // 业务自己定义的表单，自己进行数据的存储
- ;
-
- private final Integer type;
- private final String desc;
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java
deleted file mode 100644
index b7ccc7ae82..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.definition;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM 任务分配规则的类型枚举
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTaskAssignRuleTypeEnum {
-
- ROLE(10, "角色"),
- DEPT_MEMBER(20, "部门的成员"), // 包括负责人
- DEPT_LEADER(21, "部门的负责人"),
- POST(22, "岗位"),
- USER(30, "用户"),
- USER_GROUP(40, "用户组"),
- SCRIPT(50, "自定义脚本"), // 例如说，发起人所在部门的领导、发起人所在部门的领导的领导
- ;
-
- /**
- * 类型
- */
- private final Integer type;
- /**
- * 描述
- */
- private final String desc;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java
deleted file mode 100644
index 7fc0e3b8bc..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.definition;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * BPM 任务规则的脚本枚举
- * 目前暂时通过 TODO 芋艿：硬编码，未来可以考虑 Groovy 动态脚本的方式
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTaskRuleScriptEnum {
-
- START_USER(10L, "流程发起人"),
-
- LEADER_X1(20L, "流程发起人的一级领导"),
- LEADER_X2(21L, "流程发起人的二级领导");
-
- /**
- * 脚本编号
- */
- private final Long id;
- /**
- * 脚本描述
- */
- private final String desc;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
deleted file mode 100644
index 79001fccd3..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.message;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * Bpm 消息的枚举
- *
- * @author 芋道源码
- */
-@AllArgsConstructor
-@Getter
-public enum BpmMessageEnum {
-
- PROCESS_INSTANCE_APPROVE("bpm_process_instance_approve"), // 流程任务被审批通过时，发送给申请人
- PROCESS_INSTANCE_REJECT("bpm_process_instance_reject"), // 流程任务被审批不通过时，发送给申请人
- TASK_ASSIGNED("bpm_task_assigned"); // 任务被分配时，发送给审批人
-
- /**
- * 短信模板的标识
- *
- * 关联 SmsTemplateDO 的 code 属性
- */
- private final String smsTemplateCode;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmCommentTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmCommentTypeEnum.java
deleted file mode 100644
index 89d56b3c08..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmCommentTypeEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.task;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 流程任务 -- comment类型枚举
- */
-@Getter
-@AllArgsConstructor
-public enum BpmCommentTypeEnum {
-
- APPROVE(1, "通过", ""),
- REJECT(2, "不通过", ""),
- CANCEL(3, "已取消", ""),
- BACK(4, "退回", ""),
- DELEGATE(5, "委派", ""),
- ADD_SIGN(6, "加签", "[{}]{}给了[{}]，理由为：{}"),
- SUB_SIGN(7, "减签", "[{}]操作了【减签】,审批人[{}]的任务被取消"),
- ;
-
- /**
- * 操作类型
- */
- private final Integer type;
- /**
- * 操作名字
- */
- private final String name;
- /**
- * 操作描述
- */
- private final String comment;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java
deleted file mode 100644
index 4f99d0a3dc..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.task;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 流程实例的删除原因
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessInstanceDeleteReasonEnum {
-
- REJECT_TASK("不通过任务，原因：{}"), // 修改文案时，需要注意 isRejectReason 方法
- CANCEL_TASK("主动取消任务，原因：{}"),
-
- // ========== 流程任务的独有原因 ==========
- MULTI_TASK_END("系统自动取消，原因：多任务审批已经满足条件，无需审批该任务"), // 多实例满足 condition 而结束时，其它任务实例任务会被取消，对应的删除原因是 MI_END
-
- ;
-
- private final String reason;
-
- /**
- * 格式化理由
- *
- * @param args 参数
- * @return 理由
- */
- public String format(Object... args) {
- return StrUtil.format(reason, args);
- }
-
- // ========== 逻辑 ==========
-
- public static boolean isRejectReason(String reason) {
- return StrUtil.startWith(reason, "不通过任务，原因：");
- }
-
- /**
- * 将 Flowable 的删除原因，翻译成对应的中文原因
- *
- * @param reason 原始原因
- * @return 原因
- */
- public static String translateReason(String reason) {
- if (StrUtil.isEmpty(reason)) {
- return reason;
- }
- switch (reason) {
- case "MI_END": return MULTI_TASK_END.getReason();
- default: return reason;
- }
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java
deleted file mode 100644
index 615416c736..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.task;
-
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 流程实例的结果
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessInstanceResultEnum {
-
- PROCESS(1, "处理中"),
- APPROVE(2, "通过"),
- REJECT(3, "不通过"),
- CANCEL(4, "已取消"),
-
- // ========== 流程任务独有的状态 ==========
-
- BACK(5, "驳回"), // 退回
- DELEGATE(6, "委派"),
- /**
- * 【加签】源任务已经审批完成，但是它使用了后加签，后加签的任务未完成，源任务就会是这个状态
- * 相当于是 通过 APPROVE 的特殊状态
- * 例如：A审批， A 后加签了 B，并且审批通过了任务，但是 B 还未审批，则当前任务状态为“待后加签任务完成”
- */
- SIGN_AFTER(7, "待后加签任务完成"),
- /**
- * 【加签】源任务未审批，但是向前加签了，所以源任务状态变为“待前加签任务完成”
- * 相当于是 处理中 PROCESS 的特殊状态
- * 例如：A 审批， A 前加签了 B，B 还未审核
- */
- SIGN_BEFORE(8, "待前加签任务完成"),
- /**
- * 【加签】后加签任务被创建时的初始状态
- * 相当于是 处理中 PROCESS 的特殊状态
- * 因为需要源任务先完成，才能到后加签的人来审批，所以加了一个状态区分
- */
- WAIT_BEFORE_TASK(9, "待前置任务完成");
-
- /**
- * 能被减签的状态
- */
- public static final List CAN_SUB_SIGN_STATUS_LIST = Arrays.asList(PROCESS.result, WAIT_BEFORE_TASK.result);
-
- /**
- * 结果
- *
- * 如果新增时，注意 {@link #isEndResult(Integer)} 是否需要变更
- */
- private final Integer result;
- /**
- * 描述
- */
- private final String desc;
-
- /**
- * 判断该结果是否已经处于 End 最终结果
- *
- * 主要用于一些结果更新的逻辑，如果已经是最终结果，就不再进行更新
- *
- * @param result 结果
- * @return 是否
- */
- public static boolean isEndResult(Integer result) {
- return ObjectUtils.equalsAny(result, APPROVE.getResult(), REJECT.getResult(),
- CANCEL.getResult(), BACK.getResult(),
- SIGN_AFTER.getResult());
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
deleted file mode 100644
index 70a31dd342..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.task;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 流程实例的状态
- *
- * @author 芋道源码
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessInstanceStatusEnum {
-
- RUNNING(1, "进行中"),
- FINISH(2, "已完成");
-
- /**
- * 状态
- */
- private final Integer status;
- /**
- * 描述
- */
- private final String desc;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskAddSignTypeEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskAddSignTypeEnum.java
deleted file mode 100644
index 42c212e28c..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskAddSignTypeEnum.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.task;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 流程任务 -- 加签类型枚举类型
- */
-@Getter
-@AllArgsConstructor
-public enum BpmTaskAddSignTypeEnum {
-
- /**
- * 向前加签，需要前置任务审批完成，才回到原审批人
- */
- BEFORE("before", "向前加签"),
- /**
- * 向后加签，需要后置任务全部审批完，才会通过原审批人节点
- */
- AFTER("after", "向后加签"),
- /**
- * 创建后置加签时的过度状态，用于控制向后加签生成的任务状态
- */
- AFTER_CHILDREN_TASK("afterChildrenTask", "向后加签生成的子任务");
-
- private final String type;
-
- private final String desc;
-
- public static String formatDesc(String type) {
- for (BpmTaskAddSignTypeEnum value : values()) {
- if (value.type.equals(type)) {
- return value.desc;
- }
- }
- return null;
- }
-
-}
-
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml b/yudao-module-bpm/yudao-module-bpm-biz/pom.xml
deleted file mode 100644
index 12d5c5beba..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
- cn.iocoder.boot
- yudao-module-bpm
- ${revision}
-
- 4.0.0
- yudao-module-bpm-biz
-
- ${project.artifactId}
-
- bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能，基于 Flowable 6 版本实现。
- 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
-
-
-
- cn.iocoder.boot
- yudao-module-bpm-api
- ${revision}
-
-
- cn.iocoder.boot
- yudao-module-system-api
- ${revision}
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-operatelog
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-data-permission
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-biz-tenant
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-web
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-security
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-mybatis
-
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-test
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-flowable
-
-
-
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java
deleted file mode 100644
index 2137e22031..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * bpm API 实现类，定义暴露给其它模块的 API
- */
-package cn.iocoder.yudao.module.bpm.api;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
deleted file mode 100644
index f8aea4d74e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApiImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.task;
-
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-
-/**
- * Flowable 流程实例 Api 实现类
- *
- * @author 芋道源码
- * @author jason
- */
-@Service
-@Validated
-public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
-
- @Resource
- private BpmProcessInstanceService processInstanceService;
-
- @Override
- public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO) {
- return processInstanceService.createProcessInstance(userId, reqDTO);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
deleted file mode 100644
index b5065ed48e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.*;
-import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 动态表单")
-@RestController
-@RequestMapping("/bpm/form")
-@Validated
-public class BpmFormController {
-
- @Resource
- private BpmFormService formService;
-
- @PostMapping("/create")
- @Operation(summary = "创建动态表单")
- @PreAuthorize("@ss.hasPermission('bpm:form:create')")
- public CommonResult createForm(@Valid @RequestBody BpmFormCreateReqVO createReqVO) {
- return success(formService.createForm(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新动态表单")
- @PreAuthorize("@ss.hasPermission('bpm:form:update')")
- public CommonResult updateForm(@Valid @RequestBody BpmFormUpdateReqVO updateReqVO) {
- formService.updateForm(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除动态表单")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:form:delete')")
- public CommonResult deleteForm(@RequestParam("id") Long id) {
- formService.deleteForm(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得动态表单")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:form:query')")
- public CommonResult getForm(@RequestParam("id") Long id) {
- BpmFormDO form = formService.getForm(id);
- return success(BpmFormConvert.INSTANCE.convert(form));
- }
-
- @GetMapping("/list-all-simple")
- @Operation(summary = "获得动态表单的精简列表", description = "用于表单下拉框")
- public CommonResult> getSimpleForms() {
- List list = formService.getFormList();
- return success(BpmFormConvert.INSTANCE.convertList2(list));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得动态表单分页")
- @PreAuthorize("@ss.hasPermission('bpm:form:query')")
- public CommonResult> getFormPage(@Valid BpmFormPageReqVO pageVO) {
- PageResult pageResult = formService.getFormPage(pageVO);
- return success(BpmFormConvert.INSTANCE.convertPage(pageResult));
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
deleted file mode 100644
index 824a2f862d..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.io.IoUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
-import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-
-import java.io.IOException;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 流程模型")
-@RestController
-@RequestMapping("/bpm/model")
-@Validated
-public class BpmModelController {
-
- @Resource
- private BpmModelService modelService;
-
- @GetMapping("/page")
- @Operation(summary = "获得模型分页")
- public CommonResult> getModelPage(BpmModelPageReqVO pageVO) {
- return success(modelService.getModelPage(pageVO));
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得模型")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:query')")
- public CommonResult getModel(@RequestParam("id") String id) {
- BpmModelRespVO model = modelService.getModel(id);
- return success(model);
- }
-
- @PostMapping("/create")
- @Operation(summary = "新建模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:create')")
- public CommonResult createModel(@Valid @RequestBody BpmModelCreateReqVO createRetVO) {
- return success(modelService.createModel(createRetVO, null));
- }
-
- @PutMapping("/update")
- @Operation(summary = "修改模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModel(@Valid @RequestBody BpmModelUpdateReqVO modelVO) {
- modelService.updateModel(modelVO);
- return success(true);
- }
-
- @PostMapping("/import")
- @Operation(summary = "导入模型")
- @PreAuthorize("@ss.hasPermission('bpm:model:import')")
- public CommonResult importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException {
- BpmModelCreateReqVO createReqVO = BpmModelConvert.INSTANCE.convert(importReqVO);
- // 读取文件
- String bpmnXml = IoUtils.readUtf8(importReqVO.getBpmnFile().getInputStream(), false);
- return success(modelService.createModel(createReqVO, bpmnXml));
- }
-
- @PostMapping("/deploy")
- @Operation(summary = "部署模型")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:deploy')")
- public CommonResult deployModel(@RequestParam("id") String id) {
- modelService.deployModel(id);
- return success(true);
- }
-
- @PutMapping("/update-state")
- @Operation(summary = "修改模型的状态", description = "实际更新的部署的流程定义的状态")
- @PreAuthorize("@ss.hasPermission('bpm:model:update')")
- public CommonResult updateModelState(@Valid @RequestBody BpmModelUpdateStateReqVO reqVO) {
- modelService.updateModelState(reqVO.getId(), reqVO.getState());
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除模型")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:model:delete')")
- public CommonResult deleteModel(@RequestParam("id") String id) {
- modelService.deleteModel(id);
- return success(true);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
deleted file mode 100644
index 0c0fcd7d34..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 流程定义")
-@RestController
-@RequestMapping("/bpm/process-definition")
-@Validated
-public class BpmProcessDefinitionController {
-
- @Resource
- private BpmProcessDefinitionService bpmDefinitionService;
-
- @GetMapping("/page")
- @Operation(summary = "获得流程定义分页")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
- public CommonResult> getProcessDefinitionPage(
- BpmProcessDefinitionPageReqVO pageReqVO) {
- return success(bpmDefinitionService.getProcessDefinitionPage(pageReqVO));
- }
-
- @GetMapping ("/list")
- @Operation(summary = "获得流程定义列表")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
- public CommonResult> getProcessDefinitionList(
- BpmProcessDefinitionListReqVO listReqVO) {
- return success(bpmDefinitionService.getProcessDefinitionList(listReqVO));
- }
-
- @GetMapping ("/get-bpmn-xml")
- @Operation(summary = "获得流程定义的 BPMN XML")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:process-definition:query')")
- public CommonResult getProcessDefinitionBpmnXML(@RequestParam("id") String id) {
- String bpmnXML = bpmDefinitionService.getProcessDefinitionBpmnXML(id);
- return success(bpmnXML);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
deleted file mode 100644
index 3c7e404de7..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 任务分配规则")
-@RestController
-@RequestMapping("/bpm/task-assign-rule")
-@Validated
-public class BpmTaskAssignRuleController {
-
- @Resource
- private BpmTaskAssignRuleService taskAssignRuleService;
-
- @GetMapping("/list")
- @Operation(summary = "获得任务分配规则列表")
- @Parameters({
- @Parameter(name = "modelId", description = "模型编号", example = "1024"),
- @Parameter(name = "processDefinitionId", description = "流程定义的编号", example = "2048")
- })
- @PreAuthorize("@ss.hasPermission('bpm:task-assign-rule:query')")
- public CommonResult> getTaskAssignRuleList(
- @RequestParam(value = "modelId", required = false) String modelId,
- @RequestParam(value = "processDefinitionId", required = false) String processDefinitionId) {
- return success(taskAssignRuleService.getTaskAssignRuleList(modelId, processDefinitionId));
- }
-
- @PostMapping("/create")
- @Operation(summary = "创建任务分配规则")
- @PreAuthorize("@ss.hasPermission('bpm:task-assign-rule:create')")
- public CommonResult createTaskAssignRule(@Valid @RequestBody BpmTaskAssignRuleCreateReqVO reqVO) {
- return success(taskAssignRuleService.createTaskAssignRule(reqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新任务分配规则")
- @PreAuthorize("@ss.hasPermission('bpm:task-assign-rule:update')")
- public CommonResult updateTaskAssignRule(@Valid @RequestBody BpmTaskAssignRuleUpdateReqVO reqVO) {
- taskAssignRuleService.updateTaskAssignRule(reqVO);
- return success(true);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
deleted file mode 100644
index 82404b9253..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
-import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
-import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 用户组")
-@RestController
-@RequestMapping("/bpm/user-group")
-@Validated
-public class BpmUserGroupController {
-
- @Resource
- private BpmUserGroupService userGroupService;
-
- @PostMapping("/create")
- @Operation(summary = "创建用户组")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:create')")
- public CommonResult createUserGroup(@Valid @RequestBody BpmUserGroupCreateReqVO createReqVO) {
- return success(userGroupService.createUserGroup(createReqVO));
- }
-
- @PutMapping("/update")
- @Operation(summary = "更新用户组")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:update')")
- public CommonResult updateUserGroup(@Valid @RequestBody BpmUserGroupUpdateReqVO updateReqVO) {
- userGroupService.updateUserGroup(updateReqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete")
- @Operation(summary = "删除用户组")
- @Parameter(name = "id", description = "编号", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:user-group:delete')")
- public CommonResult deleteUserGroup(@RequestParam("id") Long id) {
- userGroupService.deleteUserGroup(id);
- return success(true);
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得用户组")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
- public CommonResult getUserGroup(@RequestParam("id") Long id) {
- BpmUserGroupDO userGroup = userGroupService.getUserGroup(id);
- return success(BpmUserGroupConvert.INSTANCE.convert(userGroup));
- }
-
- @GetMapping("/page")
- @Operation(summary = "获得用户组分页")
- @PreAuthorize("@ss.hasPermission('bpm:user-group:query')")
- public CommonResult> getUserGroupPage(@Valid BpmUserGroupPageReqVO pageVO) {
- PageResult pageResult = userGroupService.getUserGroupPage(pageVO);
- return success(BpmUserGroupConvert.INSTANCE.convertPage(pageResult));
- }
-
- @GetMapping("/list-all-simple")
- @Operation(summary = "获取用户组精简信息列表", description = "只包含被开启的用户组，主要用于前端的下拉选项")
- public CommonResult> getSimpleUserGroups() {
- // 获用户门列表，只要开启状态的
- List list = userGroupService.getUserGroupListByStatus(CommonStatusEnum.ENABLE.getStatus());
- // 排序后，返回给前端
- return success(BpmUserGroupConvert.INSTANCE.convertList2(list));
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
deleted file mode 100644
index fcc0cc167a..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormBaseVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import jakarta.validation.constraints.*;
-
-/**
-* 动态表单 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class BpmFormBaseVO {
-
- @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- @NotNull(message = "表单名称不能为空")
- private String name;
-
- @Schema(description = "表单状态-参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "表单状态不能为空")
- private Integer status;
-
- @Schema(description = "备注", example = "我是备注")
- private String remark;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
deleted file mode 100644
index aa014a584d..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormCreateReqVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import jakarta.validation.constraints.NotNull;
-import java.util.List;
-
-@Schema(description = "管理后台 - 动态表单创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmFormCreateReqVO extends BpmFormBaseVO {
-
- @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单的配置不能为空")
- private String conf;
-
- @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单项的数组不能为空")
- private List fields;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java
deleted file mode 100644
index 0227e0ad92..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 动态表单分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmFormPageReqVO extends PageParam {
-
- @Schema(description = "表单名称", example = "芋道")
- private String name;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
deleted file mode 100644
index b8c8f531fe..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - 动态表单 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmFormRespVO extends BpmFormBaseVO {
-
- @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单的配置不能为空")
- private String conf;
-
- @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单项的数组不能为空")
- private List fields;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java
deleted file mode 100644
index 71d8a1f802..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormSimpleRespVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 流程表单精简 Response VO")
-@Data
-public class BpmFormSimpleRespVO {
-
- @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
deleted file mode 100644
index 4248547802..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormUpdateReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import jakarta.validation.constraints.*;
-import java.util.List;
-
-@Schema(description = "管理后台 - 动态表单更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmFormUpdateReqVO extends BpmFormBaseVO {
-
- @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "表单编号不能为空")
- private Long id;
-
- @Schema(description = "表单的配置-JSON 字符串", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单的配置不能为空")
- private String conf;
-
- @Schema(description = "表单项的数组-JSON 字符串的数组", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "表单项的数组不能为空")
- private List fields;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java
deleted file mode 100644
index efe1155c3c..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupBaseVO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotNull;
-import java.util.Set;
-
-/**
-* 用户组 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class BpmUserGroupBaseVO {
-
- @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- @NotNull(message = "组名不能为空")
- private String name;
-
- @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
- @NotNull(message = "描述不能为空")
- private String description;
-
- @Schema(description = "成员编号数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
- @NotNull(message = "成员编号数组不能为空")
- private Set memberUserIds;
-
- @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "状态不能为空")
- private Integer status;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java
deleted file mode 100644
index 416c4793ae..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupCreateReqVO.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "管理后台 - 用户组创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmUserGroupCreateReqVO extends BpmUserGroupBaseVO {
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
deleted file mode 100644
index 05f17788ab..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户组分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmUserGroupPageReqVO extends PageParam {
-
- @Schema(description = "组名", example = "芋道")
- private String name;
-
- @Schema(description = "状态", example = "1")
- private Integer status;
-
- @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- @Schema(description = "创建时间")
- private LocalDateTime[] createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java
deleted file mode 100644
index 0f89e95388..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 用户组 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmUserGroupRespVO extends BpmUserGroupBaseVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java
deleted file mode 100644
index e5e2060bb7..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Schema(description = "管理后台 - 用户组精简信息 Response VO")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class BpmUserGroupSimpleRespVO {
-
- @Schema(description = "用户组编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "用户组名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
deleted file mode 100644
index 02bb2b31c4..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import jakarta.validation.constraints.*;
-
-@Schema(description = "管理后台 - 用户组更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmUserGroupUpdateReqVO extends BpmUserGroupBaseVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "编号不能为空")
- private Long id;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
deleted file mode 100644
index 798355057f..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 流程模型的导入 Request VO 相比流程模型的新建来说，只是多了一个 bpmnFile 文件")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmModeImportReqVO extends BpmModelCreateReqVO {
-
- @Schema(description = "BPMN 文件", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "BPMN 文件不能为空")
- private MultipartFile bpmnFile;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java
deleted file mode 100644
index c0b1443cbe..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelBaseVO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-/**
-* 流程模型 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class BpmModelBaseVO {
-
- @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
- @NotEmpty(message = "流程标识不能为空")
- private String key;
-
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- @NotEmpty(message = "流程名称不能为空")
- private String name;
-
- @Schema(description = "流程描述", example = "我是描述")
- private String description;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
- @NotEmpty(message = "流程分类不能为空")
- private String category;
-
- @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
- private Integer formType;
- @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", example = "1024")
- private Long formId;
- @Schema(description = "自定义表单的提交路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/create")
- private String formCustomCreatePath;
- @Schema(description = "自定义表单的查看路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/view")
- private String formCustomViewPath;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java
deleted file mode 100644
index cd4a2c1660..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelCreateReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 流程模型的创建 Request VO")
-@Data
-public class BpmModelCreateReqVO {
-
- @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_yudao")
- @NotEmpty(message = "流程标识不能为空")
- private String key;
-
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- @NotEmpty(message = "流程名称不能为空")
- private String name;
-
- @Schema(description = "流程描述", example = "我是描述")
- private String description;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java
deleted file mode 100644
index 4fc5b61d49..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageItemRespVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程模型的分页的每一项 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmModelPageItemRespVO extends BpmModelBaseVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "表单名字", example = "请假表单")
- private String formName;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- /**
- * 最新部署的流程定义
- */
- private ProcessDefinition processDefinition;
-
- @Schema(description = "流程定义")
- @Data
- public static class ProcessDefinition {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer version;
-
- @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime deploymentTime;
-
- @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer suspensionState;
-
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java
deleted file mode 100644
index 15283208e4..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelPageReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-
-@Schema(description = "管理后台 - 流程模型分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmModelPageReqVO extends PageParam {
-
- @Schema(description = "标识-精准匹配", example = "process1641042089407")
- private String key;
-
- @Schema(description = "名字-模糊匹配", example = "芋道")
- private String name;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
- private String category;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
deleted file mode 100644
index df4abf750b..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程模型的创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmModelRespVO extends BpmModelBaseVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
- private String bpmnXml;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
deleted file mode 100644
index 9cfb7bbbe3..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 流程模型的更新 Request VO")
-@Data
-public class BpmModelUpdateReqVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "编号不能为空")
- private String id;
-
- @Schema(description = "流程名称", example = "芋道")
- private String name;
-
- @Schema(description = "流程描述", example = "我是描述")
- private String description;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
- private String category;
-
- @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
- private String bpmnXml;
-
- @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
- private Integer formType;
- @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", example = "1024")
- private Long formId;
- @Schema(description = "自定义表单的提交路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/create")
- private String formCustomCreatePath;
- @Schema(description = "自定义表单的查看路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/view")
- private String formCustomViewPath;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
deleted file mode 100644
index 4d583dac23..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 流程模型更新状态 Request VO")
-@Data
-public class BpmModelUpdateStateReqVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "编号不能为空")
- private String id;
-
- @Schema(description = "状态-见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "状态不能为空")
- private Integer state;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java
deleted file mode 100644
index 35243d2ac7..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 流程定义列表 Request VO")
-@Data
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
-public class BpmProcessDefinitionListReqVO extends PageParam {
-
- @Schema(description = "中断状态-参见 SuspensionState 枚举", example = "1")
- private Integer suspensionState;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
deleted file mode 100644
index 901c8aa770..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程定义的分页的每一项 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmProcessDefinitionPageItemRespVO extends BpmProcessDefinitionRespVO {
-
- @Schema(description = "表单名字", example = "请假表单")
- private String formName;
-
- @Schema(description = "部署时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime deploymentTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java
deleted file mode 100644
index f5c7f36d61..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 流程定义分页 Request VO")
-@Data
-@ToString(callSuper = true)
-@EqualsAndHashCode(callSuper = true)
-public class BpmProcessDefinitionPageReqVO extends PageParam {
-
- @Schema(description = "标识-精准匹配", example = "process1641042089407")
- private String key;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
deleted file mode 100644
index c649c8219f..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import java.util.List;
-
-@Schema(description = "管理后台 - 流程定义 Response VO")
-@Data
-public class BpmProcessDefinitionRespVO {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer version;
-
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- @NotEmpty(message = "流程名称不能为空")
- private String name;
-
- @Schema(description = "流程描述", example = "我是描述")
- private String description;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
- @NotEmpty(message = "流程分类不能为空")
- private String category;
-
- @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
- private Integer formType;
- @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", example = "1024")
- private Long formId;
- @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
- private String formConf;
- @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
- private List formFields;
- @Schema(description = "自定义表单的提交路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/create")
- private String formCustomCreatePath;
- @Schema(description = "自定义表单的查看路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/view")
- private String formCustomViewPath;
-
- @Schema(description = "中断状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer suspensionState;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
deleted file mode 100644
index 1521abc8e0..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotNull;
-import java.util.Set;
-
-/**
- * 流程任务分配规则 Base VO，提供给添加、修改、详细的子 VO 使用
- * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
- */
-@Data
-public class BpmTaskAssignRuleBaseVO {
-
- @Schema(description = "规则类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "bpm_task_assign_rule_type")
- @NotNull(message = "规则类型不能为空")
- private Integer type;
-
- @Schema(description = "规则值数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1,2,3")
- @NotNull(message = "规则值数组不能为空")
- private Set options;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
deleted file mode 100644
index 90e6b7e33e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 流程任务分配规则的创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskAssignRuleCreateReqVO extends BpmTaskAssignRuleBaseVO {
-
- @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "流程模型的编号不能为空")
- private String modelId;
-
- @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- @NotEmpty(message = "流程任务定义的编号不能为空")
- private String taskDefinitionKey;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java
deleted file mode 100644
index ac4f85e789..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-@Schema(description = "管理后台 - 流程任务分配规则的 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskAssignRuleRespVO extends BpmTaskAssignRuleBaseVO {
-
- @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "流程模型的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- private String modelId;
-
- @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "4096")
- private String processDefinitionId;
-
- @Schema(description = "流程任务定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- private String taskDefinitionKey;
- @Schema(description = "流程任务定义的名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "关注芋道")
- private String taskDefinitionName;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
deleted file mode 100644
index 7d13cc07ad..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import jakarta.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 流程任务分配规则的更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskAssignRuleUpdateReqVO extends BpmTaskAssignRuleBaseVO {
-
- @Schema(description = "任务分配规则的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "任务分配规则的编号不能为空")
- private Long id;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http
deleted file mode 100644
index 96bbf964db..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http
+++ /dev/null
@@ -1,12 +0,0 @@
-### 请求 /bpm/oa/leave/create 接口 => 成功
-POST {{baseUrl}}/bpm/oa/leave/create
-Content-Type: application/json
-tenant-id: 1
-Authorization: Bearer {{token}}
-
-{
- "startTime": "2022-03-01",
- "endTime": "2022-03-05",
- "type": 1,
- "reason": "我要请假啦啦啦！"
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
deleted file mode 100644
index b964694a5a..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO;
-import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-/**
- * OA 请假申请 Controller，用于演示自己存储数据，接入工作流的例子
- *
- * @author jason
- * @author 芋道源码
- */
-@Tag(name = "管理后台 - OA 请假申请")
-@RestController
-@RequestMapping("/bpm/oa/leave")
-@Validated
-public class BpmOALeaveController {
-
- @Resource
- private BpmOALeaveService leaveService;
-
- @PostMapping("/create")
- @PreAuthorize("@ss.hasPermission('bpm:oa-leave:create')")
- @Operation(summary = "创建请求申请")
- public CommonResult createLeave(@Valid @RequestBody BpmOALeaveCreateReqVO createReqVO) {
- return success(leaveService.createLeave(getLoginUserId(), createReqVO));
- }
-
- @GetMapping("/get")
- @PreAuthorize("@ss.hasPermission('bpm:oa-leave:query')")
- @Operation(summary = "获得请假申请")
- @Parameter(name = "id", description = "编号", required = true, example = "1024")
- public CommonResult getLeave(@RequestParam("id") Long id) {
- BpmOALeaveDO leave = leaveService.getLeave(id);
- return success(BpmOALeaveConvert.INSTANCE.convert(leave));
- }
-
- @GetMapping("/page")
- @PreAuthorize("@ss.hasPermission('bpm:oa-leave:query')")
- @Operation(summary = "获得请假申请分页")
- public CommonResult> getLeavePage(@Valid BpmOALeavePageReqVO pageVO) {
- PageResult pageResult = leaveService.getLeavePage(getLoginUserId(), pageVO);
- return success(BpmOALeaveConvert.INSTANCE.convertPage(pageResult));
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java
deleted file mode 100644
index 7028708b1e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * OA 示例，用于演示外部业务接入 BPM 工作流的示例
- * 一般的接入方式，只需要调用 接口，后续 Admin 用户在管理后台的【待办事务】进行审批
- */
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
deleted file mode 100644
index f7089f8594..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-/**
-* 请假申请 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
-@Data
-public class BpmOALeaveBaseVO {
-
- @Schema(description = "请假的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "开始时间不能为空")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime startTime;
- @Schema(description = "请假的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "结束时间不能为空")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime endTime;
-
- @Schema(description = "请假类型-参见 bpm_oa_type 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer type;
-
- @Schema(description = "原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "阅读芋道源码")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java
deleted file mode 100644
index 56ee98b337..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import jakarta.validation.constraints.AssertTrue;
-
-@Schema(description = "管理后台 - 请假申请创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmOALeaveCreateReqVO extends BpmOALeaveBaseVO {
-
- @AssertTrue(message = "结束时间，需要在开始时间之后")
- public boolean isEndTimeValid() {
- return !getEndTime().isBefore(getStartTime());
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java
deleted file mode 100644
index 903a0fcf27..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 请假申请分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmOALeavePageReqVO extends PageParam {
-
- @Schema(description = "状态-参见 bpm_process_instance_result 枚举", example = "1")
- private Integer result;
-
- @Schema(description = "请假类型-参见 bpm_oa_type", example = "1")
- private Integer type;
-
- @Schema(description = "原因-模糊匹配", example = "阅读芋道源码")
- private String reason;
-
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- @Schema(description = "申请时间")
- private LocalDateTime[] createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
deleted file mode 100644
index 669e309e7e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 请假申请 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmOALeaveRespVO extends BpmOALeaveBaseVO {
-
- @Schema(description = "请假表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long id;
-
- @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer result;
-
- @Schema(description = "申请时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "申请时间不能为空")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime createTime;
-
- @Schema(description = "流程id")
- private String processInstanceId;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
deleted file mode 100644
index 8e7e76a3e1..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
-import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import jakarta.annotation.Resource;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "管理后台 - 流程活动实例")
-@RestController
-@RequestMapping("/bpm/activity")
-@Validated
-public class BpmActivityController {
-
- @Resource
- private BpmActivityService activityService;
-
- @GetMapping("/list")
- @Operation(summary = "生成指定流程实例的高亮流程图",
- description = "只高亮进行中的任务。不过要注意，该接口暂时没用，通过前端的 ProcessViewer.vue 界面的 highlightDiagram 方法生成")
- @Parameter(name = "processInstanceId", description = "流程实例的编号", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:task:query')")
- public CommonResult> getActivityList(
- @RequestParam("processInstanceId") String processInstanceId) {
- return success(activityService.getActivityListByProcessInstanceId(processInstanceId));
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
deleted file mode 100644
index af8e8edcd1..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
-import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 流程实例") // 流程实例，通过流程定义创建的一次“申请”
-@RestController
-@RequestMapping("/bpm/process-instance")
-@Validated
-public class BpmProcessInstanceController {
-
- @Resource
- private BpmProcessInstanceService processInstanceService;
-
- @GetMapping("/my-page")
- @Operation(summary = "获得我的实例分页列表", description = "在【我的流程】菜单中，进行调用")
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
- public CommonResult> getMyProcessInstancePage(
- @Valid BpmProcessInstanceMyPageReqVO pageReqVO) {
- return success(processInstanceService.getMyProcessInstancePage(getLoginUserId(), pageReqVO));
- }
-
- @PostMapping("/create")
- @Operation(summary = "新建流程实例")
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
- public CommonResult createProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) {
- return success(processInstanceService.createProcessInstance(getLoginUserId(), createReqVO));
- }
-
- @GetMapping("/get")
- @Operation(summary = "获得指定流程实例", description = "在【流程详细】界面中，进行调用")
- @Parameter(name = "id", description = "流程实例的编号", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
- public CommonResult getProcessInstance(@RequestParam("id") String id) {
- return success(processInstanceService.getProcessInstanceVO(id));
- }
-
- @DeleteMapping("/cancel")
- @Operation(summary = "取消流程实例", description = "撤回发起的流程")
- @PreAuthorize("@ss.hasPermission('bpm:process-instance:cancel')")
- public CommonResult cancelProcessInstance(@Valid @RequestBody BpmProcessInstanceCancelReqVO cancelReqVO) {
- processInstanceService.cancelProcessInstance(getLoginUserId(), cancelReqVO);
- return success(true);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
deleted file mode 100644
index ba14b61f1d..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
-import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-
-@Tag(name = "管理后台 - 流程任务实例")
-@RestController
-@RequestMapping("/bpm/task")
-@Validated
-public class BpmTaskController {
-
- @Resource
- private BpmTaskService taskService;
-
- @GetMapping("todo-page")
- @Operation(summary = "获取 Todo 待办任务分页")
- @PreAuthorize("@ss.hasPermission('bpm:task:query')")
- public CommonResult> getTodoTaskPage(@Valid BpmTaskTodoPageReqVO pageVO) {
- return success(taskService.getTodoTaskPage(getLoginUserId(), pageVO));
- }
-
- @GetMapping("done-page")
- @Operation(summary = "获取 Done 已办任务分页")
- @PreAuthorize("@ss.hasPermission('bpm:task:query')")
- public CommonResult> getDoneTaskPage(@Valid BpmTaskDonePageReqVO pageVO) {
- return success(taskService.getDoneTaskPage(getLoginUserId(), pageVO));
- }
-
- @GetMapping("/list-by-process-instance-id")
- @Operation(summary = "获得指定流程实例的任务列表", description = "包括完成的、未完成的")
- @Parameter(name = "processInstanceId", description = "流程实例的编号", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:task:query')")
- public CommonResult> getTaskListByProcessInstanceId(
- @RequestParam("processInstanceId") String processInstanceId) {
- return success(taskService.getTaskListByProcessInstanceId(processInstanceId));
- }
-
- @PutMapping("/approve")
- @Operation(summary = "通过任务")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult approveTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
- taskService.approveTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @PutMapping("/reject")
- @Operation(summary = "不通过任务")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult rejectTask(@Valid @RequestBody BpmTaskRejectReqVO reqVO) {
- taskService.rejectTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @PutMapping("/update-assignee")
- @Operation(summary = "更新任务的负责人", description = "用于【流程详情】的【转派】按钮")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult updateTaskAssignee(@Valid @RequestBody BpmTaskUpdateAssigneeReqVO reqVO) {
- taskService.updateTaskAssignee(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @GetMapping("/return-list")
- @Operation(summary = "获取所有可回退的节点", description = "用于【流程详情】的【回退】按钮")
- @Parameter(name = "taskId", description = "当前任务ID", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult> getReturnList(@RequestParam("taskId") String taskId) {
- return success(taskService.getReturnTaskList(taskId));
- }
-
- @PutMapping("/return")
- @Operation(summary = "回退任务", description = "用于【流程详情】的【回退】按钮")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult returnTask(@Valid @RequestBody BpmTaskReturnReqVO reqVO) {
- taskService.returnTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @PutMapping("/delegate")
- @Operation(summary = "委派任务", description = "用于【流程详情】的【委派】按钮。和向前【加签】有点像，唯一区别是【委托】没有单独创立任务")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult delegateTask(@Valid @RequestBody BpmTaskDelegateReqVO reqVO) {
- taskService.delegateTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @PutMapping("/create-sign")
- @Operation(summary = "加签", description = "before 前加签，after 后加签")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult createSignTask(@Valid @RequestBody BpmTaskAddSignReqVO reqVO) {
- taskService.createSignTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @DeleteMapping("/delete-sign")
- @Operation(summary = "减签")
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult deleteSignTask(@Valid @RequestBody BpmTaskSubSignReqVO reqVO) {
- taskService.deleteSignTask(getLoginUserId(), reqVO);
- return success(true);
- }
-
- @GetMapping("children-list")
- @Operation(summary = "获取能被减签的任务")
- @Parameter(name = "parentId", description = "父级任务 ID", required = true)
- @PreAuthorize("@ss.hasPermission('bpm:task:update')")
- public CommonResult> getChildrenTaskList(@RequestParam("parentId") String parentId) {
- return success(taskService.getChildrenTaskList(parentId));
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java
deleted file mode 100644
index ab6468204c..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程活动的 Response VO")
-@Data
-public class BpmActivityRespVO {
-
- @Schema(description = "流程活动的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String key;
- @Schema(description = "流程活动的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartEvent")
- private String type;
-
- @Schema(description = "流程活动的开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime startTime;
- @Schema(description = "流程活动的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime endTime;
-
- @Schema(description = "关联的流程任务的编号-关联的流程任务，只有 UserTask 等类型才有", example = "2048")
- private String taskId;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
deleted file mode 100644
index 36d4724a09..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 流程实例的取消 Request VO")
-@Data
-public class BpmProcessInstanceCancelReqVO {
-
- @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "流程实例的编号不能为空")
- private String id;
-
- @Schema(description = "取消原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了！")
- @NotEmpty(message = "取消原因不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
deleted file mode 100644
index 93c22dddc8..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import java.util.List;
-import java.util.Map;
-
-@Schema(description = "管理后台 - 流程实例的创建 Request VO")
-@Data
-public class BpmProcessInstanceCreateReqVO {
-
- @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "流程定义编号不能为空")
- private String processDefinitionId;
-
- @Schema(description = "变量实例")
- private Map variables;
-
- // TODO @hai：assignees 复数
- @Schema(description = "提前指派的审批人", requiredMode = Schema.RequiredMode.REQUIRED, example = "{taskKey1: [1, 2]}")
- private Map> assignee;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java
deleted file mode 100644
index 5b5d9fb26d..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 流程实例的分页 Item Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmProcessInstanceMyPageReqVO extends PageParam {
-
- @Schema(description = "流程名称", example = "芋道")
- private String name;
-
- @Schema(description = "流程定义的编号", example = "2048")
- private String processDefinitionId;
-
- @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", example = "1")
- private Integer status;
-
- @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", example = "2")
- private Integer result;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", example = "1")
- private String category;
-
- @Schema(description = "创建时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java
deleted file mode 100644
index 6bb269f1d1..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Schema(description = "管理后台 - 流程实例的分页 Item Response VO")
-@Data
-public class BpmProcessInstancePageItemRespVO {
-
- @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
- @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- private String processDefinitionId;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private String category;
-
- @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer result;
-
- @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime endTime;
-
- /**
- * 当前任务
- */
- private List tasks;
-
- @Schema(description = "流程任务")
- @Data
- public static class Task {
-
- @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
deleted file mode 100644
index a9cc810f72..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-@Schema(description = "管理后台 - 流程实例的 Response VO")
-@Data
-public class BpmProcessInstanceRespVO {
-
- @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
- @Schema(description = "流程分类-参见 bpm_model_category 数据字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private String category;
-
- @Schema(description = "流程实例的状态-参见 bpm_process_instance_status", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer status;
-
- @Schema(description = "流程实例的结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer result;
-
- @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime endTime;
-
- @Schema(description = "提交的表单值", requiredMode = Schema.RequiredMode.REQUIRED)
- private Map formVariables;
-
- @Schema(description = "业务的唯一标识-例如说，请假申请的编号", example = "1")
- private String businessKey;
-
- /**
- * 发起流程的用户
- */
- private User startUser;
-
- /**
- * 流程定义
- */
- private ProcessDefinition processDefinition;
-
- @Schema(description = "用户信息")
- @Data
- public static class User {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
- private String nickname;
-
- @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
- @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
- private String deptName;
-
- }
-
- @Schema(description = "流程定义信息")
- @Data
- public static class ProcessDefinition {
-
- @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "表单类型-参见 bpm_model_form_type 数据字典", example = "1")
- private Integer formType;
- @Schema(description = "表单编号-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", example = "1024")
- private Long formId;
- @Schema(description = "表单的配置-JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
- private String formConf;
- @Schema(description = "表单项的数组-JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空", requiredMode = Schema.RequiredMode.REQUIRED)
- private List formFields;
- @Schema(description = "自定义表单的提交路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/create")
- private String formCustomCreatePath;
- @Schema(description = "自定义表单的查看路径，使用 Vue 的路由地址-在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空",
- example = "/bpm/oa/leave/view")
- private String formCustomViewPath;
-
- @Schema(description = "BPMN XML", requiredMode = Schema.RequiredMode.REQUIRED)
- private String bpmnXml;
-
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java
deleted file mode 100644
index 68369696b5..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import java.util.Set;
-
-// TODO @海洋：类名，应该是 create 哈
-@Schema(description = "管理后台 - 加签流程任务的 Request VO")
-@Data
-public class BpmTaskAddSignReqVO {
-
- @Schema(description = "需要加签的任务 ID")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "加签的用户 ID")
- @NotEmpty(message = "加签用户 ID 不能为空")
- private Set userIdList;
-
- @Schema(description = "加签类型，before 向前加签，after 向后加签")
- @NotEmpty(message = "加签类型不能为空")
- private String type;
-
- @Schema(description = "加签原因")
- @NotEmpty(message = "加签原因不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
deleted file mode 100644
index 14dca13ea6..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 通过流程任务的 Request VO")
-@Data
-public class BpmTaskApproveReqVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错！")
- @NotEmpty(message = "审批意见不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java
deleted file mode 100644
index 2d16206617..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDelegateReqVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 委派流程任务的 Request VO")
-@Data
-public class BpmTaskDelegateReqVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "被委派人 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "被委派人 ID 不能为空")
- private Long delegateUserId;
-
- @Schema(description = "委派原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "做不了决定，需要你先帮忙瞅瞅")
- @NotEmpty(message = "委派原因不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java
deleted file mode 100644
index 8f51441587..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程任务的 Done 已完成的分页项 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskDonePageItemRespVO extends BpmTaskTodoPageItemRespVO {
-
- @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime endTime;
- @Schema(description = "持续时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
- private Long durationInMillis;
-
- @Schema(description = "任务结果-参见 bpm_process_instance_result", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
- private Integer result;
- @Schema(description = "审批建议", requiredMode = Schema.RequiredMode.REQUIRED, example = "不请假了！")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java
deleted file mode 100644
index 52daea445e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 流程任务的 Done 已办的分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskDonePageReqVO extends PageParam {
-
- @Schema(description = "流程任务名", example = "芋道")
- private String name;
-
- @Schema(description = "开始的创建收间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime beginCreateTime;
-
- @Schema(description = "结束的创建时间")
- @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime endCreateTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
deleted file mode 100644
index acb4ee91d3..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 不通过流程任务的 Request VO")
-@Data
-public class BpmTaskRejectReqVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "不错不错！")
- @NotEmpty(message = "审批意见不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
deleted file mode 100644
index 1af839e26b..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.util.List;
-
-@Schema(description = "管理后台 - 流程任务的 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
-
- @Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "user-001")
- private String definitionKey;
-
- /**
- * 审核的用户信息
- */
- private User assigneeUser;
-
- /**
- * 父任务ID
- */
- private String parentTaskId;
-
- @Schema(description = "子任务（由加签生成）", requiredMode = Schema.RequiredMode.REQUIRED, example = "childrenTask")
- private List children;
-
- @Schema(description = "用户信息")
- @Data
- public static class User {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
- private String nickname;
-
- @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
- @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
- private String deptName;
-
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
deleted file mode 100644
index ca27ff6d5d..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-@Schema(description = "管理后台 - 回退流程任务的 Request VO")
-@Data
-public class BpmTaskReturnReqVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "回退到的任务 Key", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotEmpty(message = "回退到的任务 Key 不能为空")
- private String targetDefinitionKey;
-
- @Schema(description = "回退意见", requiredMode = Schema.RequiredMode.REQUIRED, example = "我就是想驳回")
- @NotEmpty(message = "回退意见不能为空")
- private String reason;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSimpleRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSimpleRespVO.java
deleted file mode 100644
index b98a25a222..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSimpleRespVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 流程任务的精简 Response VO")
-@Data
-public class BpmTaskSimpleRespVO {
-
- @Schema(description = "任务定义的标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "Activity_one")
- private String definitionKey;
-
- @Schema(description = "任务名词", requiredMode = Schema.RequiredMode.REQUIRED, example = "经理审批")
- private String name;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignReqVO.java
deleted file mode 100644
index a2966a399e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-
-// TODO @海洋：类名，应该是 delete 哈
-@Schema(description = "管理后台 - 减签流程任务的 Request VO")
-@Data
-public class BpmTaskSubSignReqVO {
-
- @Schema(description = "被减签的任务 ID")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "加签原因")
- @NotEmpty(message = "加签原因不能为空")
- private String reason;
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignRespVO.java
deleted file mode 100644
index efecbf5821..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignRespVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 减签流程任务的 Response VO")
-@Data
-public class BpmTaskSubSignRespVO {
- @Schema(description = "审核的用户信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "小李")
- private BpmTaskRespVO.User assigneeUser;
- @Schema(description = "任务 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12312")
- private String id;
- @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "经理审批")
- private String name;
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java
deleted file mode 100644
index 4b57f47770..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Schema(description = "管理后台 - 流程任务的 Running 进行中的分页项 Response VO")
-@Data
-public class BpmTaskTodoPageItemRespVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
- @Schema(description = "接收时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime claimTime;
-
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- private LocalDateTime createTime;
-
- @Schema(description = "激活状态-参见 SuspensionState 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Integer suspensionState;
-
- /**
- * 所属流程实例
- */
- private ProcessInstance processInstance;
-
- @Data
- @Schema(description = "流程实例")
- public static class ProcessInstance {
-
- @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private String id;
-
- @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
- private String name;
-
- @Schema(description = "发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long startUserId;
-
- @Schema(description = "发起人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
- private String startUserNickname;
-
- @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- private String processDefinitionId;
-
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
deleted file mode 100644
index 605007ef5c..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
-@Schema(description = "管理后台 - 流程任务的 TODO 待办的分页 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class BpmTaskTodoPageReqVO extends PageParam {
-
- @Schema(description = "流程任务名", example = "芋道")
- private String name;
-
- @Schema(description = "创建时间")
- @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
- private LocalDateTime[] createTime;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java
deleted file mode 100644
index 51c10bfc58..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 流程任务的更新负责人的 Request VO")
-@Data
-public class BpmTaskUpdateAssigneeReqVO {
-
- @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotEmpty(message = "任务编号不能为空")
- private String id;
-
- @Schema(description = "新审批人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
- @NotNull(message = "新审批人的用户编号不能为空")
- private Long assigneeUserId;
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java
deleted file mode 100644
index e8d285e359..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package cn.iocoder.yudao.module.bpm.controller.app;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java
deleted file mode 100644
index d1930bd6ac..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 提供 RESTful API 给前端：
- * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
- * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
- */
-package cn.iocoder.yudao.module.bpm.controller;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java
deleted file mode 100644
index 6ba7574170..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.definition;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormSimpleRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 动态表单 Convert
- *
- * @author 芋艿
- */
-@Mapper
-public interface BpmFormConvert {
-
- BpmFormConvert INSTANCE = Mappers.getMapper(BpmFormConvert.class);
-
- BpmFormDO convert(BpmFormCreateReqVO bean);
-
- BpmFormDO convert(BpmFormUpdateReqVO bean);
-
- BpmFormRespVO convert(BpmFormDO bean);
-
- List convertList2(List list);
-
- PageResult convertPage(PageResult page);
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
deleted file mode 100644
index 9f79032f60..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.definition;
-
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
-import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
-import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
-import org.flowable.common.engine.impl.db.SuspensionState;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.Model;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * 流程模型 Convert
- *
- * @author yunlongn
- */
-@Mapper
-public interface BpmModelConvert {
-
- BpmModelConvert INSTANCE = Mappers.getMapper(BpmModelConvert.class);
-
- default List convertList(List list, Map formMap,
- Map deploymentMap,
- Map processDefinitionMap) {
- return CollectionUtils.convertList(list, model -> {
- BpmModelMetaInfoRespDTO metaInfo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
- BpmFormDO form = metaInfo != null ? formMap.get(metaInfo.getFormId()) : null;
- Deployment deployment = model.getDeploymentId() != null ? deploymentMap.get(model.getDeploymentId()) : null;
- ProcessDefinition processDefinition = model.getDeploymentId() != null ? processDefinitionMap.get(model.getDeploymentId()) : null;
- return convert(model, form, deployment, processDefinition);
- });
- }
-
- default BpmModelPageItemRespVO convert(Model model, BpmFormDO form, Deployment deployment, ProcessDefinition processDefinition) {
- BpmModelPageItemRespVO modelRespVO = new BpmModelPageItemRespVO();
- modelRespVO.setId(model.getId());
- modelRespVO.setCreateTime(DateUtils.of(model.getCreateTime()));
- // 通用 copy
- copyTo(model, modelRespVO);
- // Form
- if (form != null) {
- modelRespVO.setFormId(form.getId());
- modelRespVO.setFormName(form.getName());
- }
- // ProcessDefinition
- modelRespVO.setProcessDefinition(this.convert(processDefinition));
- if (modelRespVO.getProcessDefinition() != null) {
- modelRespVO.getProcessDefinition().setSuspensionState(processDefinition.isSuspended() ?
- SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode());
- modelRespVO.getProcessDefinition().setDeploymentTime(DateUtils.of(deployment.getDeploymentTime()));
- }
- return modelRespVO;
- }
-
- default BpmModelRespVO convert(Model model) {
- BpmModelRespVO modelRespVO = new BpmModelRespVO();
- modelRespVO.setId(model.getId());
- modelRespVO.setCreateTime(DateUtils.of(model.getCreateTime()));
- // 通用 copy
- copyTo(model, modelRespVO);
- return modelRespVO;
- }
-
- default void copyTo(Model model, BpmModelBaseVO to) {
- to.setName(model.getName());
- to.setKey(model.getKey());
- to.setCategory(model.getCategory());
- // metaInfo
- BpmModelMetaInfoRespDTO metaInfo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
- copyTo(metaInfo, to);
- }
-
- BpmModelCreateReqVO convert(BpmModeImportReqVO bean);
-
- default BpmProcessDefinitionCreateReqDTO convert2(Model model, BpmFormDO form) {
- BpmProcessDefinitionCreateReqDTO createReqDTO = new BpmProcessDefinitionCreateReqDTO();
- createReqDTO.setModelId(model.getId());
- createReqDTO.setName(model.getName());
- createReqDTO.setKey(model.getKey());
- createReqDTO.setCategory(model.getCategory());
- BpmModelMetaInfoRespDTO metaInfo = JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class);
- // metaInfo
- copyTo(metaInfo, createReqDTO);
- // form
- if (form != null) {
- createReqDTO.setFormConf(form.getConf());
- createReqDTO.setFormFields(form.getFields());
- }
- return createReqDTO;
- }
-
- void copyTo(BpmModelMetaInfoRespDTO from, @MappingTarget BpmProcessDefinitionCreateReqDTO to);
-
- void copyTo(BpmModelMetaInfoRespDTO from, @MappingTarget BpmModelBaseVO to);
-
- BpmModelPageItemRespVO.ProcessDefinition convert(ProcessDefinition bean);
-
- default void copy(Model model, BpmModelCreateReqVO bean) {
- model.setName(bean.getName());
- model.setKey(bean.getKey());
- model.setMetaInfo(buildMetaInfoStr(null, bean.getDescription(), null, null,
- null, null));
- }
-
- default void copy(Model model, BpmModelUpdateReqVO bean) {
- model.setName(bean.getName());
- model.setCategory(bean.getCategory());
- model.setMetaInfo(buildMetaInfoStr(JsonUtils.parseObject(model.getMetaInfo(), BpmModelMetaInfoRespDTO.class),
- bean.getDescription(), bean.getFormType(), bean.getFormId(),
- bean.getFormCustomCreatePath(), bean.getFormCustomViewPath()));
- }
-
- default String buildMetaInfoStr(BpmModelMetaInfoRespDTO metaInfo, String description, Integer formType,
- Long formId, String formCustomCreatePath, String formCustomViewPath) {
- if (metaInfo == null) {
- metaInfo = new BpmModelMetaInfoRespDTO();
- }
- // 只有非空，才进行设置，避免更新时的覆盖
- if (StrUtil.isNotEmpty(description)) {
- metaInfo.setDescription(description);
- }
- if (Objects.nonNull(formType)) {
- metaInfo.setFormType(formType);
- metaInfo.setFormId(formId);
- metaInfo.setFormCustomCreatePath(formCustomCreatePath);
- metaInfo.setFormCustomViewPath(formCustomViewPath);
- }
- return JsonUtils.toJsonString(metaInfo);
- }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
deleted file mode 100644
index b52b48ee9e..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.definition;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
-import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
-import org.flowable.common.engine.impl.db.SuspensionState;
-import org.flowable.engine.repository.Deployment;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Bpm 流程定义的 Convert
- *
- * @author yunlong.li
- */
-@Mapper
-public interface BpmProcessDefinitionConvert {
-
- BpmProcessDefinitionConvert INSTANCE = Mappers.getMapper(BpmProcessDefinitionConvert.class);
-
- BpmProcessDefinitionPageItemRespVO convert(ProcessDefinition bean);
-
- BpmProcessDefinitionExtDO convert2(BpmProcessDefinitionCreateReqDTO bean);
-
- default List convertList(List list, Map deploymentMap,
- Map processDefinitionDOMap, Map formMap) {
- return CollectionUtils.convertList(list, definition -> {
- Deployment deployment = definition.getDeploymentId() != null ? deploymentMap.get(definition.getDeploymentId()) : null;
- BpmProcessDefinitionExtDO definitionDO = processDefinitionDOMap.get(definition.getId());
- BpmFormDO form = definitionDO != null ? formMap.get(definitionDO.getFormId()) : null;
- return convert(definition, deployment, definitionDO, form);
- });
- }
-
- default List convertList3(List list,
- Map processDefinitionDOMap) {
- return CollectionUtils.convertList(list, processDefinition -> {
- BpmProcessDefinitionRespVO respVO = convert3(processDefinition);
- BpmProcessDefinitionExtDO processDefinitionExtDO = processDefinitionDOMap.get(processDefinition.getId());
- // 复制通用属性
- copyTo(processDefinitionExtDO, respVO);
- return respVO;
- });
- }
-
- @Mapping(source = "suspended", target = "suspensionState", qualifiedByName = "convertSuspendedToSuspensionState")
- BpmProcessDefinitionRespVO convert3(ProcessDefinition bean);
-
- @Named("convertSuspendedToSuspensionState")
- default Integer convertSuspendedToSuspensionState(boolean suspended) {
- return suspended ? SuspensionState.SUSPENDED.getStateCode() :
- SuspensionState.ACTIVE.getStateCode();
- }
-
- default BpmProcessDefinitionPageItemRespVO convert(ProcessDefinition bean, Deployment deployment,
- BpmProcessDefinitionExtDO processDefinitionExtDO, BpmFormDO form) {
- BpmProcessDefinitionPageItemRespVO respVO = convert(bean);
- respVO.setSuspensionState(bean.isSuspended() ? SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode());
- if (deployment != null) {
- respVO.setDeploymentTime(LocalDateTimeUtil.of(deployment.getDeploymentTime()));
- }
- if (form != null) {
- respVO.setFormName(form.getName());
- }
- // 复制通用属性
- copyTo(processDefinitionExtDO, respVO);
- return respVO;
- }
-
- @Mapping(source = "from.id", target = "to.id", ignore = true)
- void copyTo(BpmProcessDefinitionExtDO from, @MappingTarget BpmProcessDefinitionRespVO to);
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java
deleted file mode 100644
index c616e90b09..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.definition;
-
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
-import org.flowable.bpmn.model.UserTask;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface BpmTaskAssignRuleConvert {
- BpmTaskAssignRuleConvert INSTANCE = Mappers.getMapper(BpmTaskAssignRuleConvert.class);
-
- default List convertList(List tasks, List rules) {
- Map ruleMap = CollectionUtils.convertMap(rules, BpmTaskAssignRuleDO::getTaskDefinitionKey);
- // 以 UserTask 为主维度，原因是：流程图编辑后，一些规则实际就没用了。
- return CollectionUtils.convertList(tasks, task -> {
- BpmTaskAssignRuleRespVO respVO = convert(ruleMap.get(task.getId()));
- if (respVO == null) {
- respVO = new BpmTaskAssignRuleRespVO();
- respVO.setTaskDefinitionKey(task.getId());
- }
- respVO.setTaskDefinitionName(task.getName());
- return respVO;
- });
- }
-
- BpmTaskAssignRuleRespVO convert(BpmTaskAssignRuleDO bean);
-
- BpmTaskAssignRuleDO convert(BpmTaskAssignRuleCreateReqVO bean);
-
- BpmTaskAssignRuleDO convert(BpmTaskAssignRuleUpdateReqVO bean);
-
- List convertList2(List list);
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java
deleted file mode 100644
index bbf00ba524..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.definition;
-
-import java.util.*;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.mapstruct.Mapper;
-import org.mapstruct.Named;
-import org.mapstruct.factory.Mappers;
-
-/**
- * 用户组 Convert
- *
- * @author 芋道源码
- */
-@Mapper
-public interface BpmUserGroupConvert {
-
- BpmUserGroupConvert INSTANCE = Mappers.getMapper(BpmUserGroupConvert.class);
-
- BpmUserGroupDO convert(BpmUserGroupCreateReqVO bean);
-
- BpmUserGroupDO convert(BpmUserGroupUpdateReqVO bean);
-
- BpmUserGroupRespVO convert(BpmUserGroupDO bean);
-
- List convertList(List list);
-
- PageResult convertPage(PageResult page);
-
- @Named("convertList2")
- List convertList2(List list);
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
deleted file mode 100644
index 99b7bebf23..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/message/BpmMessageConvert.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.message;
-
-import cn.iocoder.yudao.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Map;
-
-@Mapper
-public interface BpmMessageConvert {
-
- BpmMessageConvert INSTANCE = Mappers.getMapper(BpmMessageConvert.class);
-
- @Mapping(target = "mobile", ignore = true)
- @Mapping(source = "userId", target = "userId")
- @Mapping(source = "templateCode", target = "templateCode")
- @Mapping(source = "templateParams", target = "templateParams")
- SmsSendSingleToUserReqDTO convert(Long userId, String templateCode, Map templateParams);
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java
deleted file mode 100644
index f87531bfc5..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.oa;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 请假申请 Convert
- *
- * @author 芋艿
- */
-@Mapper
-public interface BpmOALeaveConvert {
-
- BpmOALeaveConvert INSTANCE = Mappers.getMapper(BpmOALeaveConvert.class);
-
- BpmOALeaveDO convert(BpmOALeaveCreateReqVO bean);
-
- BpmOALeaveRespVO convert(BpmOALeaveDO bean);
-
- List convertList(List list);
-
- PageResult convertPage(PageResult page);
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java
deleted file mode 100644
index 6db6ebc461..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 提供 POJO 类的实体转换
- *
- * 目前使用 MapStruct 框架
- */
-package cn.iocoder.yudao.module.bpm.convert;
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java
deleted file mode 100644
index 3cb674c1c3..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.task;
-
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
-import org.flowable.engine.history.HistoricActivityInstance;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * BPM 活动 Convert
- *
- * @author 芋道源码
- */
-@Mapper(uses = DateUtils.class)
-public interface BpmActivityConvert {
-
- BpmActivityConvert INSTANCE = Mappers.getMapper(BpmActivityConvert.class);
-
- List convertList(List list);
-
- @Mappings({
- @Mapping(source = "activityId", target = "key"),
- @Mapping(source = "activityType", target = "type")
- })
- BpmActivityRespVO convert(HistoricActivityInstance bean);
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
deleted file mode 100644
index 8296b8bb3a..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.task;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageItemRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
-import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
-import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
-import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程实例 Convert
- *
- * @author 芋道源码
- */
-@Mapper(uses = DateUtils.class)
-public interface BpmProcessInstanceConvert {
-
- BpmProcessInstanceConvert INSTANCE = Mappers.getMapper(BpmProcessInstanceConvert.class);
-
- default PageResult convertPage(PageResult page,
- Map> taskMap) {
- List list = convertList(page.getList());
- list.forEach(respVO -> respVO.setTasks(convertList2(taskMap.get(respVO.getId()))));
- return new PageResult<>(list, page.getTotal());
- }
-
- List convertList(List list);
-
- @Mapping(source = "processInstanceId", target = "id")
- BpmProcessInstancePageItemRespVO convert(BpmProcessInstanceExtDO bean);
-
- List convertList2(List tasks);
-
- default BpmProcessInstanceRespVO convert2(HistoricProcessInstance processInstance, BpmProcessInstanceExtDO processInstanceExt,
- ProcessDefinition processDefinition, BpmProcessDefinitionExtDO processDefinitionExt,
- String bpmnXml, AdminUserRespDTO startUser, DeptRespDTO dept) {
- BpmProcessInstanceRespVO respVO = convert2(processInstance);
- copyTo(processInstanceExt, respVO);
- // definition
- respVO.setProcessDefinition(convert2(processDefinition));
- copyTo(processDefinitionExt, respVO.getProcessDefinition());
- respVO.getProcessDefinition().setBpmnXml(bpmnXml);
- // user
- if (startUser != null) {
- respVO.setStartUser(convert2(startUser));
- if (dept != null) {
- respVO.getStartUser().setDeptName(dept.getName());
- }
- }
- return respVO;
- }
-
- BpmProcessInstanceRespVO convert2(HistoricProcessInstance bean);
-
- @Mapping(source = "from.id", target = "to.id", ignore = true)
- void copyTo(BpmProcessInstanceExtDO from, @MappingTarget BpmProcessInstanceRespVO to);
-
- BpmProcessInstanceRespVO.ProcessDefinition convert2(ProcessDefinition bean);
-
- @Mapping(source = "from.id", target = "to.id", ignore = true)
- void copyTo(BpmProcessDefinitionExtDO from, @MappingTarget BpmProcessInstanceRespVO.ProcessDefinition to);
-
- BpmProcessInstanceRespVO.User convert2(AdminUserRespDTO bean);
-
- default BpmProcessInstanceResultEvent convert(Object source, HistoricProcessInstance instance, Integer result) {
- BpmProcessInstanceResultEvent event = new BpmProcessInstanceResultEvent(source);
- event.setId(instance.getId());
- event.setProcessDefinitionKey(instance.getProcessDefinitionKey());
- event.setBusinessKey(instance.getBusinessKey());
- event.setResult(result);
- return event;
- }
-
- default BpmProcessInstanceResultEvent convert(Object source, ProcessInstance instance, Integer result) {
- BpmProcessInstanceResultEvent event = new BpmProcessInstanceResultEvent(source);
- event.setId(instance.getId());
- event.setProcessDefinitionKey(instance.getProcessDefinitionKey());
- event.setBusinessKey(instance.getBusinessKey());
- event.setResult(result);
- return event;
- }
-
- default BpmMessageSendWhenProcessInstanceApproveReqDTO convert2ApprovedReq(ProcessInstance instance){
- return new BpmMessageSendWhenProcessInstanceApproveReqDTO()
- .setStartUserId(NumberUtils.parseLong(instance.getStartUserId()))
- .setProcessInstanceId(instance.getId())
- .setProcessInstanceName(instance.getName());
- }
-
- default BpmMessageSendWhenProcessInstanceRejectReqDTO convert2RejectReq(ProcessInstance instance, String reason) {
- return new BpmMessageSendWhenProcessInstanceRejectReqDTO()
- .setProcessInstanceName(instance.getName())
- .setProcessInstanceId(instance.getId())
- .setReason(reason)
- .setStartUserId(NumberUtils.parseLong(instance.getStartUserId()));
- }
-
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
deleted file mode 100644
index 60ce840218..0000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package cn.iocoder.yudao.module.bpm.convert.task;
-
-import cn.hutool.core.date.LocalDateTimeUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
-import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
-import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import org.flowable.bpmn.model.FlowElement;
-import org.flowable.common.engine.impl.db.SuspensionState;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.flowable.task.service.impl.persistence.entity.TaskEntityImpl;
-import org.mapstruct.*;
-import org.mapstruct.factory.Mappers;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
-
-/**
- * Bpm 任务 Convert
- *
- * @author 芋道源码
- */
-@Mapper(uses = DateUtils.class)
-public interface BpmTaskConvert {
-
- BpmTaskConvert INSTANCE = Mappers.getMapper(BpmTaskConvert.class);
-
- default List convertList1(List tasks,
- Map processInstanceMap,
- Map userMap) {
- return CollectionUtils.convertList(tasks, task -> {
- BpmTaskTodoPageItemRespVO respVO = convert1(task);
- ProcessInstance processInstance = processInstanceMap.get(task.getProcessInstanceId());
- if (processInstance != null) {
- AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- respVO.setProcessInstance(convert(processInstance, startUser));
- }
- return respVO;
- });
- }
-
- @Mapping(source = "suspended", target = "suspensionState", qualifiedByName = "convertSuspendedToSuspensionState")
- BpmTaskTodoPageItemRespVO convert1(Task bean);
-
- @Named("convertSuspendedToSuspensionState")
- default Integer convertSuspendedToSuspensionState(boolean suspended) {
- return suspended ? SuspensionState.SUSPENDED.getStateCode() : SuspensionState.ACTIVE.getStateCode();
- }
-
- default List convertList2(List tasks,
- Map bpmTaskExtDOMap, Map historicProcessInstanceMap,
- Map userMap) {
- return CollectionUtils.convertList(tasks, task -> {
- BpmTaskDonePageItemRespVO respVO = convert2(task);
- BpmTaskExtDO taskExtDO = bpmTaskExtDOMap.get(task.getId());
- copyTo(taskExtDO, respVO);
- HistoricProcessInstance processInstance = historicProcessInstanceMap.get(task.getProcessInstanceId());
- if (processInstance != null) {
- AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- respVO.setProcessInstance(convert(processInstance, startUser));
- }
- return respVO;
- });
- }
-
- BpmTaskDonePageItemRespVO convert2(HistoricTaskInstance bean);
-
- @Mappings({
- @Mapping(source = "processInstance.id", target = "id"),
- @Mapping(source = "processInstance.name", target = "name"),
- @Mapping(source = "processInstance.startUserId", target = "startUserId"),
- @Mapping(source = "processInstance.processDefinitionId", target = "processDefinitionId"),
- @Mapping(source = "startUser.nickname", target = "startUserNickname")
- })
- BpmTaskTodoPageItemRespVO.ProcessInstance convert(ProcessInstance processInstance, AdminUserRespDTO startUser);
-
- default List convertList3(List tasks,
- Map bpmTaskExtDOMap, HistoricProcessInstance processInstance,
- Map userMap, Map deptMap) {
- return CollectionUtils.convertList(tasks, task -> {
- BpmTaskRespVO respVO = convert3(task);
- BpmTaskExtDO taskExtDO = bpmTaskExtDOMap.get(task.getId());
- copyTo(taskExtDO, respVO);
- if (processInstance != null) {
- AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
- respVO.setProcessInstance(convert(processInstance, startUser));
- }
- AdminUserRespDTO assignUser = userMap.get(NumberUtils.parseLong(task.getAssignee()));
- if (assignUser != null) {
- respVO.setAssigneeUser(convert3(assignUser));
- DeptRespDTO dept = deptMap.get(assignUser.getDeptId());
- if (dept != null) {
- respVO.getAssigneeUser().setDeptName(dept.getName());
- }
- }
- return respVO;
- });
- }
-
- @Mapping(source = "taskDefinitionKey", target = "definitionKey")
- BpmTaskRespVO convert3(HistoricTaskInstance bean);
-
- BpmTaskRespVO.User convert3(AdminUserRespDTO bean);
-
- @Mapping(target = "id", ignore = true)
- void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to);
-
- @Mappings({@Mapping(source = "processInstance.id", target = "id"),
- @Mapping(source = "processInstance.name", target = "name"),
- @Mapping(source = "processInstance.startUserId", target = "startUserId"),
- @Mapping(source = "processInstance.processDefinitionId", target = "processDefinitionId"),
- @Mapping(source = "startUser.nickname", target = "startUserNickname")})
- BpmTaskTodoPageItemRespVO.ProcessInstance convert(HistoricProcessInstance processInstance,
- AdminUserRespDTO startUser);
-
- default BpmTaskExtDO convert2TaskExt(Task task) {
- BpmTaskExtDO taskExtDO = new BpmTaskExtDO().setTaskId(task.getId())
- .setAssigneeUserId(NumberUtils.parseLong(task.getAssignee())).setName(task.getName())
- .setProcessDefinitionId(task.getProcessDefinitionId()).setProcessInstanceId(task.getProcessInstanceId());
- taskExtDO.setCreateTime(LocalDateTimeUtil.of(task.getCreateTime()));
- return taskExtDO;
- }
-
- default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser,
- Task task) {
- BpmMessageSendWhenTaskCreatedReqDTO reqDTO = new BpmMessageSendWhenTaskCreatedReqDTO();
- reqDTO.setProcessInstanceId(processInstance.getProcessInstanceId())
- .setProcessInstanceName(processInstance.getName()).setStartUserId(startUser.getId())
- .setStartUserNickname(startUser.getNickname()).setTaskId(task.getId()).setTaskName(task.getName())
- .setAssigneeUserId(NumberUtils.parseLong(task.getAssignee()));
- return reqDTO;
- }
-
- default List convertList(List elementList) {
- return CollectionUtils.convertList(elementList, element -> new BpmTaskSimpleRespVO()
- .setName(element.getName())
- .setDefinitionKey(element.getId()));
- }
-
- //此处不用 mapstruct 映射，因为 TaskEntityImpl 还有很多其他属性，这里我们只设置我们需要的
- //使用 mapstruct 会将里面嵌套的各个属性值都设置进去，会出现意想不到的问题
- default TaskEntityImpl convert(TaskEntityImpl task,TaskEntityImpl parentTask){
- task.setCategory(parentTask.getCategory());
- task.setDescription(parentTask.getDescription());
- task.setTenantId(parentTask.getTenantId());
- task.setName(parentTask.getName());
- task.setParentTaskId(parentTask.getId());
- task.setProcessDefinitionId(parentTask.getProcessDefinitionId());
- task.setProcessInstanceId(parentTask.getProcessInstanceId());
- task.setTaskDefinitionKey(parentTask.getTaskDefinitionKey());
- task.setTaskDefinitionId(parentTask.getTaskDefinitionId());
- task.setPriority(parentTask.getPriority());
- task.setCreateTime(new Date());
- return task;
- }
-
- default List convertList(List bpmTaskExtDOList,
- Map
- 
+