From 67f3324617256960c66a04253835d61bd7fe38c4 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 23 May 2025 13:11:16 +0800 Subject: [PATCH] =?UTF-8?q?(=E3=80=83'=E2=96=BD'=E3=80=83)=20v2.6.0=20?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9A=E7=AE=80=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E5=B8=8C=E6=9C=9B=E4=BD=A0=E4=BC=9A?= =?UTF-8?q?=E5=96=9C=E6=AC=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 7 - .../yudao/module/bpm/api/package-info.java | 4 - .../yudao/module/crm/api/package-info.java | 4 - yudao-module-infra/pom.xml | 7 - .../yudao-module-infra-biz/pom.xml | 124 ------------------ .../module/product/api/package-info.java | 4 - .../comment/ProductCommentController.http | 0 .../app/comment/AppCommentController.http | 0 .../module/promotion/api/package-info.java | 4 - .../member/api/message/package-info.java | 4 - .../yudao/module/member/api/package-info.java | 4 - ...道 Spring Boot 对象转换 MapStruct 入门》.md | 1 - .../yudao/module/pay/api/package-info.java | 4 - .../dal/dataobject/channel/PayChannelDO.java | 116 ---------------- .../client/exception/PayClientException.java | 17 --- .../pay/framework/pay/package-info.java | 6 - yudao-module-system/pom.xml | 7 - .../yudao-module-system-biz/pom.xml | 116 ---------------- 18 files changed, 429 deletions(-) delete mode 100644 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java delete mode 100644 yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/api/package-info.java delete mode 100644 yudao-module-infra/yudao-module-infra-biz/pom.xml delete mode 100644 yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java delete mode 100644 yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.http delete mode 100644 yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.http delete mode 100644 yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/api/package-info.java delete mode 100644 yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/message/package-info.java delete mode 100644 yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java delete mode 100644 yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md delete mode 100644 yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/package-info.java delete mode 100644 yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/channel/PayChannelDO.java delete mode 100644 yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/exception/PayClientException.java delete mode 100644 yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/package-info.java delete mode 100644 yudao-module-system/yudao-module-system-biz/pom.xml diff --git a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml index 1dc0b085a8..6c6e828569 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml +++ b/yudao-framework/yudao-spring-boot-starter-biz-data-permission/pom.xml @@ -34,13 +34,6 @@ yudao-spring-boot-starter-mybatis - - - cn.iocoder.boot - yudao-module-system-api - ${revision} - - diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java deleted file mode 100644 index def88bd2f3..0000000000 --- a/yudao-module-bpm/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-crm/src/main/java/cn/iocoder/yudao/module/crm/api/package-info.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/api/package-info.java deleted file mode 100644 index 84cf922ea6..0000000000 --- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * crm API 包，定义并实现提供给其它模块的 API - */ -package cn.iocoder.yudao.module.crm.api; diff --git a/yudao-module-infra/pom.xml b/yudao-module-infra/pom.xml index 8b983cfe4b..a9f5341b92 100644 --- a/yudao-module-infra/pom.xml +++ b/yudao-module-infra/pom.xml @@ -65,13 +65,6 @@ yudao-spring-boot-starter-mq - - - cn.iocoder.boot - yudao-spring-boot-starter-test - test - - cn.iocoder.boot diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml deleted file mode 100644 index 896c2f77cc..0000000000 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - cn.iocoder.boot - yudao-module-infra - ${revision} - - 4.0.0 - yudao-module-infra-biz - jar - - ${project.artifactId} - - infra 模块，主要提供两块能力： - 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - - - - - cn.iocoder.boot - yudao-module-system-api - ${revision} - - - cn.iocoder.boot - yudao-module-infra-api - ${revision} - - - - - cn.iocoder.boot - yudao-spring-boot-starter-biz-tenant - - - - - cn.iocoder.boot - yudao-spring-boot-starter-security - - - - cn.iocoder.boot - yudao-spring-boot-starter-websocket - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mybatis - - - com.baomidou - mybatis-plus-generator - - - - cn.iocoder.boot - yudao-spring-boot-starter-redis - - - - - - - cn.iocoder.boot - yudao-spring-boot-starter-job - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mq - - - - - - cn.iocoder.boot - yudao-spring-boot-starter-excel - - - - org.apache.velocity - velocity-engine-core - - - - - cn.iocoder.boot - yudao-spring-boot-starter-monitor - - - - de.codecentric - spring-boot-admin-starter-server - - - - - commons-net - commons-net - - - com.jcraft - jsch - - - - software.amazon.awssdk - s3 - - - - org.apache.tika - tika-core - - - - - diff --git a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java deleted file mode 100644 index e3e7412e91..0000000000 --- a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * product API 包，定义并实现提供给其它模块的 API - */ -package cn.iocoder.yudao.module.product.api; diff --git a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.http b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/comment/ProductCommentController.http deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.http b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/app/comment/AppCommentController.http deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/api/package-info.java b/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/api/package-info.java deleted file mode 100644 index d507b68960..0000000000 --- a/yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * promotion API 包，定义并实现提供给其它模块的 API - */ -package cn.iocoder.yudao.module.promotion.api; diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/message/package-info.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/message/package-info.java deleted file mode 100644 index 084525b590..0000000000 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package cn.iocoder.yudao.module.member.api.message; diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java deleted file mode 100644 index 8f74d80917..0000000000 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * member API 包，定义并实现提供给其它模块的 API - */ -package cn.iocoder.yudao.module.member.api; diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487b72..0000000000 --- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/package-info.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/package-info.java deleted file mode 100644 index 256747ca5f..0000000000 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * pay API 包，定义并实现提供给其它模块的 API - */ -package cn.iocoder.yudao.module.pay.api; diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/channel/PayChannelDO.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/channel/PayChannelDO.java deleted file mode 100644 index abfef6ad9e..0000000000 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/channel/PayChannelDO.java +++ /dev/null @@ -1,116 +0,0 @@ -package cn.iocoder.yudao.module.pay.dal.dataobject.channel; - -import cn.hutool.core.util.StrUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; -import cn.iocoder.yudao.framework.common.util.json.JsonUtils; -import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; -import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO; -import cn.iocoder.yudao.module.pay.enums.PayChannelEnum; -import cn.iocoder.yudao.module.pay.framework.pay.core.client.PayClientConfig; -import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.NonePayClientConfig; -import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.alipay.AlipayPayClientConfig; -import cn.iocoder.yudao.module.pay.framework.pay.core.client.impl.weixin.WxPayClientConfig; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler; -import com.fasterxml.jackson.core.type.TypeReference; -import lombok.*; - -import java.lang.reflect.Field; - -/** - * 支付渠道 DO - * 一个应用下，会有多种支付渠道，例如说微信支付、支付宝支付等等 - * - * 即 PayAppDO : PayChannelDO = 1 : n - * - * @author 芋道源码 - */ -@TableName(value = "pay_channel", autoResultMap = true) -@KeySequence("pay_channel_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class PayChannelDO extends TenantBaseDO { - - /** - * 渠道编号，数据库自增 - */ - private Long id; - /** - * 渠道编码 - * - * 枚举 {@link PayChannelEnum} - */ - private String code; - /** - * 状态 - * - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - /** - * 渠道费率，单位：百分比 - */ - private Double feeRate; - /** - * 备注 - */ - private String remark; - - /** - * 应用编号 - * - * 关联 {@link PayAppDO#getId()} - */ - private Long appId; - /** - * 支付渠道配置 - */ - @TableField(typeHandler = PayClientConfigTypeHandler.class) - private PayClientConfig config; - - public static class PayClientConfigTypeHandler extends AbstractJsonTypeHandler { - - public PayClientConfigTypeHandler(Class type) { - super(type); - } - - public PayClientConfigTypeHandler(Class type, Field field) { - super(type, field); - } - - @Override - public Object parse(String json) { - PayClientConfig config = JsonUtils.parseObjectQuietly(json, new TypeReference() {}); - if (config != null) { - return config; - } - - // 兼容老版本的包路径 - String className = JsonUtils.parseObject(json, "@class", String.class); - className = StrUtil.subAfter(className, ".", true); - switch (className) { - case "AlipayPayClientConfig": - return JsonUtils.parseObject2(json, AlipayPayClientConfig.class); - case "WxPayClientConfig": - return JsonUtils.parseObject2(json, WxPayClientConfig.class); - case "NonePayClientConfig": - return JsonUtils.parseObject2(json, NonePayClientConfig.class); - default: - throw new IllegalArgumentException("未知的 PayClientConfig 类型：" + json); - } - } - - @Override - public String toJson(Object obj) { - return JsonUtils.toJsonString(obj); - } - - } - -} diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/exception/PayClientException.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/exception/PayClientException.java deleted file mode 100644 index 8cedc4e150..0000000000 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/exception/PayClientException.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.iocoder.yudao.module.pay.framework.pay.core.client.exception; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 支付系统异常 Exception - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class PayClientException extends RuntimeException { - - public PayClientException(Throwable cause) { - super(cause); - } - -} diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/package-info.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/package-info.java deleted file mode 100644 index 90f457702c..0000000000 --- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 支付客户端，接入国内多个支付渠道： - * 1. 支付宝，基于官方 SDK 接入 - * 2. 微信支付，基于 weixin-java-pay 接入 - */ -package cn.iocoder.yudao.module.pay.framework.pay; \ No newline at end of file diff --git a/yudao-module-system/pom.xml b/yudao-module-system/pom.xml index a0bcb5f3ec..05e7cfe2a1 100644 --- a/yudao-module-system/pom.xml +++ b/yudao-module-system/pom.xml @@ -72,13 +72,6 @@ yudao-spring-boot-starter-mq - - - cn.iocoder.boot - yudao-spring-boot-starter-test - test - - cn.iocoder.boot diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml deleted file mode 100644 index 51c0432a23..0000000000 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - cn.iocoder.boot - yudao-module-system - ${revision} - - 4.0.0 - yudao-module-system-biz - jar - - ${project.artifactId} - - system 模块下，我们放通用业务，支撑上层的核心业务。 - 例如说：用户、部门、权限、数据字典等等 - - - - - cn.iocoder.boot - yudao-module-system-api - ${revision} - - - cn.iocoder.boot - yudao-module-infra-api - ${revision} - - - - - 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-biz-ip - - - - - cn.iocoder.boot - yudao-spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mybatis - - - - cn.iocoder.boot - yudao-spring-boot-starter-redis - - - - - cn.iocoder.boot - yudao-spring-boot-starter-job - - - - - cn.iocoder.boot - yudao-spring-boot-starter-mq - - - - - cn.iocoder.boot - yudao-spring-boot-starter-excel - - - - org.springframework.boot - spring-boot-starter-mail - - - - - me.zhyd.oauth - JustAuth - - - com.xkcoding.justauth - justauth-spring-boot-starter - - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - - com.anji-plus - captcha-spring-boot-starter - - - -