Commit eefd9a71fc1b6df3ad60194f43d1fca8aef38f21
1 parent
14893c4c
pay:默认禁用 pay 模块,进一步提升启动速度
Showing
7 changed files
with
6 additions
and
123 deletions
yudao-server/pom.xml
| ... | ... | @@ -54,11 +54,11 @@ |
| 54 | 54 | <!-- <version>${revision}</version>--> |
| 55 | 55 | <!-- </dependency>--> |
| 56 | 56 | <!-- 支付服务 --> |
| 57 | - <dependency> | |
| 58 | - <groupId>cn.iocoder.boot</groupId> | |
| 59 | - <artifactId>yudao-module-pay-biz</artifactId> | |
| 60 | - <version>${revision}</version> | |
| 61 | - </dependency> | |
| 57 | +<!-- <dependency>--> | |
| 58 | +<!-- <groupId>cn.iocoder.boot</groupId>--> | |
| 59 | +<!-- <artifactId>yudao-module-pay-biz</artifactId>--> | |
| 60 | +<!-- <version>${revision}</version>--> | |
| 61 | +<!-- </dependency>--> | |
| 62 | 62 | |
| 63 | 63 | <!-- 微信公众号模块。默认注释,保证编译速度 --> |
| 64 | 64 | <!-- <dependency>--> | ... | ... |
yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/package-info.java deleted
yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java deleted
| 1 | -package cn.iocoder.yudao.module.shop.controller.app; | |
| 2 | - | |
| 3 | -import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | -import cn.iocoder.yudao.module.pay.api.notify.dto.PayOrderNotifyReqDTO; | |
| 5 | -import cn.iocoder.yudao.module.pay.api.notify.dto.PayRefundNotifyReqDTO; | |
| 6 | -import cn.iocoder.yudao.module.pay.service.order.PayOrderService; | |
| 7 | -import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO; | |
| 8 | -import cn.iocoder.yudao.module.pay.util.PaySeqUtils; | |
| 9 | -import cn.iocoder.yudao.module.shop.controller.app.vo.AppShopOrderCreateRespVO; | |
| 10 | -import io.swagger.v3.oas.annotations.tags.Tag; | |
| 11 | -import io.swagger.v3.oas.annotations.Operation; | |
| 12 | -import lombok.extern.slf4j.Slf4j; | |
| 13 | -import org.springframework.validation.annotation.Validated; | |
| 14 | -import org.springframework.web.bind.annotation.PostMapping; | |
| 15 | -import org.springframework.web.bind.annotation.RequestBody; | |
| 16 | -import org.springframework.web.bind.annotation.RequestMapping; | |
| 17 | -import org.springframework.web.bind.annotation.RestController; | |
| 18 | - | |
| 19 | -import javax.annotation.Resource; | |
| 20 | -import javax.validation.Valid; | |
| 21 | -import java.time.LocalDateTime; | |
| 22 | - | |
| 23 | -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 24 | -import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP; | |
| 25 | - | |
| 26 | -@Tag(name = "用户 APP - 商城订单") | |
| 27 | -@RestController | |
| 28 | -@RequestMapping("/shop/order") | |
| 29 | -@Validated | |
| 30 | -@Slf4j | |
| 31 | -public class AppShopOrderController { | |
| 32 | - | |
| 33 | - @Resource | |
| 34 | - private PayOrderService payOrderService; | |
| 35 | - | |
| 36 | - @PostMapping("/create") | |
| 37 | - @Operation(summary = "创建商城订单") | |
| 38 | -// @PreAuthenticated // TODO 暂时不加登陆验证,前端暂时没做好 | |
| 39 | - public CommonResult<AppShopOrderCreateRespVO> create() { | |
| 40 | - // 假装创建商城订单 | |
| 41 | - Long shopOrderId = System.currentTimeMillis(); | |
| 42 | - | |
| 43 | - // 创建对应的支付订单 | |
| 44 | - PayOrderCreateReqDTO reqDTO = new PayOrderCreateReqDTO(); | |
| 45 | - reqDTO.setAppId(6L); | |
| 46 | - reqDTO.setUserIp(getClientIP()); | |
| 47 | - reqDTO.setMerchantOrderId(PaySeqUtils.genMerchantOrderNo()); | |
| 48 | - reqDTO.setSubject("标题:" + shopOrderId); | |
| 49 | - reqDTO.setBody("内容:" + shopOrderId); | |
| 50 | - reqDTO.setAmount(200); // 单位:分 | |
| 51 | - reqDTO.setExpireTime(LocalDateTime.now().plusDays(1)); | |
| 52 | - Long payOrderId = payOrderService.createPayOrder(reqDTO); | |
| 53 | - | |
| 54 | - // 拼接返回 | |
| 55 | - return success(AppShopOrderCreateRespVO.builder().id(shopOrderId) | |
| 56 | - .payOrderId(payOrderId).build()); | |
| 57 | - } | |
| 58 | - | |
| 59 | - @PostMapping("/pay-notify") | |
| 60 | - @Operation(summary = "支付回调") | |
| 61 | - public CommonResult<Boolean> payNotify(@RequestBody @Valid PayOrderNotifyReqDTO reqVO) { | |
| 62 | - log.info("[payNotify][回调成功]"); | |
| 63 | - return success(true); | |
| 64 | - } | |
| 65 | - | |
| 66 | - @PostMapping("/refund-notify") | |
| 67 | - @Operation(summary = "退款回调") | |
| 68 | - public CommonResult<Boolean> refundNotify(@RequestBody @Valid PayRefundNotifyReqDTO reqVO) { | |
| 69 | - log.info("[refundNotify][回调成功]"); | |
| 70 | - return success(true); | |
| 71 | - } | |
| 72 | - | |
| 73 | -} |
yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/vo/AppShopOrderCreateRespVO.java deleted
| 1 | -package cn.iocoder.yudao.module.shop.controller.app.vo; | |
| 2 | - | |
| 3 | -import io.swagger.v3.oas.annotations.media.Schema; | |
| 4 | -import lombok.AllArgsConstructor; | |
| 5 | -import lombok.Builder; | |
| 6 | -import lombok.Data; | |
| 7 | - | |
| 8 | -@Schema(description = "用户 APP - 商城订单创建 Response VO") | |
| 9 | -@Data | |
| 10 | -@Builder | |
| 11 | -@AllArgsConstructor | |
| 12 | -public class AppShopOrderCreateRespVO { | |
| 13 | - | |
| 14 | - @Schema(description = "商城订单编号", required = true, example = "1024") | |
| 15 | - private Long id; | |
| 16 | - | |
| 17 | - @Schema(description = "支付订单编号", required = true, example = "2048") | |
| 18 | - private Long payOrderId; | |
| 19 | - | |
| 20 | -} |
yudao-server/src/main/java/cn/iocoder/yudao/module/shop/package-info.java deleted
yudao-server/src/main/java/cn/iocoder/yudao/server/framework/ui/core/AdminUiController.java deleted
yudao-server/src/main/resources/application-local.yaml
| ... | ... | @@ -78,7 +78,7 @@ spring: |
| 78 | 78 | # Quartz 配置项,对应 QuartzProperties 配置类 |
| 79 | 79 | spring: |
| 80 | 80 | quartz: |
| 81 | - auto-startup: true # 本地开发环境,尽量不要开启 Job | |
| 81 | + auto-startup: false # 本地开发环境,尽量不要开启 Job | |
| 82 | 82 | scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName |
| 83 | 83 | job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存,可选 jdbc 使用数据库。 |
| 84 | 84 | wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时,是否等待定时任务执行完成。默认为 false ,建议设置为 true | ... | ... |