Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/user-social

Conflicts: yudao-admin-server/pom.xml yudao-dependencies/pom.xml yudao-user-server/src/main/resources/application-dev.yaml yudao-user-server/src/main/resources/application-local.yaml
2025-07-16 20:15:06 +08:00 · 2021-10-30 09:30:18 +08:00
parent cba9c609d7 b336655a51
commit c3aa2acddf
159 changed files with 6708 additions and 75 deletions
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/package-info.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/member/package-info.java
@ -1,7 +1,8 @@
 /**
- * member 包下，我们放会员业务.
- * 例如说：会员中心等等
+ * weixin 包下，我们放微信相关业务.
+ * 例如说：微信公众号、等等
+ * ps：微信支付，还是放在 pay 包下
 *
- * 缩写：mbr
+ * 缩写：wx
 */
-package cn.iocoder.yudao.userserver.modules.member;
+package cn.iocoder.yudao.userserver.modules.member;
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/PayOrderController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/PayOrderController.java
@ -0,0 +1,61 @@
+package cn.iocoder.yudao.userserver.modules.pay.controller.order;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.iocoder.yudao.coreservice.modules.pay.dal.dataobject.order.PayOrderDO;
+import cn.iocoder.yudao.coreservice.modules.pay.service.order.PayOrderCoreService;
+import cn.iocoder.yudao.coreservice.modules.pay.service.order.dto.PayOrderSubmitReqDTO;
+import cn.iocoder.yudao.coreservice.modules.pay.service.order.dto.PayOrderSubmitRespDTO;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.pay.core.enums.PayChannelEnum;
+import cn.iocoder.yudao.userserver.modules.pay.controller.order.vo.PayOrderSubmitReqVO;
+import cn.iocoder.yudao.userserver.modules.pay.controller.order.vo.PayOrderSubmitRespVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
+
+@Api(tags = "支付订单")
+@RestController
+@RequestMapping("/pay/order")
+@Validated
+@Slf4j
+public class PayOrderController {
+
+    @Resource
+    private PayOrderCoreService payOrderCoreService;
+
+    @PostMapping("/submit")
+    @ApiOperation("提交支付订单")
+//    @PreAuthenticated // TODO 暂时不加登陆验证，前端暂时没做好
+    public CommonResult<PayOrderSubmitRespVO> submitPayOrder(@RequestBody PayOrderSubmitReqVO reqVO) {
+        // 获得订单
+        PayOrderDO payOrder = payOrderCoreService.getPayOrder(reqVO.getId());
+
+        // 提交支付
+        PayOrderSubmitReqDTO reqDTO = new PayOrderSubmitReqDTO();
+        BeanUtil.copyProperties(reqVO, reqDTO, false);
+        reqDTO.setUserIp(getClientIP());
+        reqDTO.setAppId(payOrder.getAppId());
+        PayOrderSubmitRespDTO respDTO = payOrderCoreService.submitPayOrder(reqDTO);
+
+        // 拼接返回
+        return success(PayOrderSubmitRespVO.builder().invokeResponse(respDTO.getInvokeResponse()).build());
+    }
+
+    // ========== 支付渠道的回调 ==========
+
+    @PostMapping("/notify/wx-pub/{channelId}")
+    @ApiOperation("通知微信公众号的结果")
+    public String notifyWxPayOrder(@PathVariable("channelId") Long channelId,
+                                   @RequestBody String xmlData) throws Exception {
+        payOrderCoreService.notifyPayOrder(channelId, PayChannelEnum.WX_PUB.getCode(), xmlData);
+        return "success";
+    }
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitReqVO.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitReqVO.java
@ -0,0 +1,28 @@
+package cn.iocoder.yudao.userserver.modules.pay.controller.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Map;
+
+@ApiModel("支付订单提交 Request VO")
+@Data
+@Accessors(chain = true)
+public class PayOrderSubmitReqVO {
+
+    @ApiModelProperty(value = "支付单编号", required = true, example = "1024")
+    @NotNull(message = "支付单编号不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "支付渠道", required = true, example = "wx_pub")
+    @NotEmpty(message = "支付渠道不能为空")
+    private String channelCode;
+
+    @ApiModelProperty(value = "支付渠道的额外参数", notes = "例如说，微信公众号需要传递 openid 参数")
+    private Map<String, String> channelExtras;
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/controller/order/vo/PayOrderSubmitRespVO.java
@ -0,0 +1,23 @@
+package cn.iocoder.yudao.userserver.modules.pay.controller.order.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@ApiModel("支付订单提交 Response VO")
+@Data
+@Accessors(chain = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PayOrderSubmitRespVO {
+
+    /**
+     * 调用支付渠道的响应结果
+     */
+    private Object invokeResponse;
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/package-info.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/pay/package-info.java
@ -0,0 +1,7 @@
+/**
+ * pay 包下，我们放支付业务，提供业务的支付能力。
+ * 例如说：商户、应用、支付、退款等等
+ *
+ * 缩写：pay
+ */
+package cn.iocoder.yudao.userserver.modules.pay;
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/controller/ShopOrderController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/controller/ShopOrderController.java
@ -0,0 +1,65 @@
+package cn.iocoder.yudao.userserver.modules.shop.controller;
+
+import cn.iocoder.yudao.coreservice.modules.pay.service.notify.vo.PayNotifyOrderReqVO;
+import cn.iocoder.yudao.coreservice.modules.pay.service.order.PayOrderCoreService;
+import cn.iocoder.yudao.coreservice.modules.pay.service.order.dto.PayOrderCreateReqDTO;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.iocoder.yudao.userserver.modules.shop.controller.vo.ShopOrderCreateRespVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.time.Duration;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
+
+@Api(tags = "商城订单")
+@RestController
+@RequestMapping("/shop/order")
+@Validated
+@Slf4j
+public class ShopOrderController {
+
+    @Resource
+    private PayOrderCoreService payOrderCoreService;
+
+    @PostMapping("/create")
+    @ApiOperation("创建商城订单")
+//    @PreAuthenticated // TODO 暂时不加登陆验证，前端暂时没做好
+    public CommonResult<ShopOrderCreateRespVO> create() {
+        // 假装创建商城订单
+        Long shopOrderId = System.currentTimeMillis();
+
+        // 创建对应的支付订单
+        PayOrderCreateReqDTO reqDTO = new PayOrderCreateReqDTO();
+        reqDTO.setAppId(6L);
+        reqDTO.setUserIp(getClientIP());
+        reqDTO.setMerchantOrderId(String.valueOf(System.currentTimeMillis()));
+        reqDTO.setSubject("标题：" + shopOrderId);
+        reqDTO.setBody("内容：" + shopOrderId);
+        reqDTO.setAmount(1); // 单位：分
+        reqDTO.setExpireTime(DateUtils.addTime(Duration.ofDays(1)));
+        Long payOrderId = payOrderCoreService.createPayOrder(reqDTO);
+
+        // 拼接返回
+        return success(ShopOrderCreateRespVO.builder().id(shopOrderId)
+                .payOrderId(payOrderId).build());
+    }
+
+    @PostMapping("/pay-notify")
+    @ApiOperation("支付回调")
+    public CommonResult<Boolean> payNotify(@RequestBody @Valid PayNotifyOrderReqVO reqVO) {
+        log.info("[payNotify][回调成功]");
+        return success(true);
+    }
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/controller/vo/ShopOrderCreateRespVO.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/controller/vo/ShopOrderCreateRespVO.java
@ -0,0 +1,21 @@
+package cn.iocoder.yudao.userserver.modules.shop.controller.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@ApiModel("商城订单创建 Response VO")
+@Data
+@Builder
+@AllArgsConstructor
+public class ShopOrderCreateRespVO {
+
+    @ApiModelProperty(value = "商城订单编号", required = true, example = "1024")
+    private Long id;
+
+    @ApiModelProperty(value = "支付订单编号", required = true, example = "2048")
+    private Long payOrderId;
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/package-info.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/shop/package-info.java
@ -0,0 +1,8 @@
+/**
+ * shop 包下，我们放商城业务
+ * 例如说：商品、订单等等
+ * 注意，目前仅仅作为 demo 演示，对接 pay 支付系统
+ *
+ * 缩写：shop
+ */
+package cn.iocoder.yudao.userserver.modules.shop;
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/controller/mp/WxMpController.http
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/controller/mp/WxMpController.http
@ -0,0 +1,2 @@
+### 请求 /login 接口 => 成功
+GET {{userServerUrl}}/wx/mp/get-jsapi-ticket
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/controller/mp/WxMpController.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/controller/mp/WxMpController.java
@ -0,0 +1,37 @@
+package cn.iocoder.yudao.userserver.modules.weixin.controller.mp;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.WxJsapiSignature;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Api(tags = "微信公众号")
+@RestController
+@RequestMapping("/wx/mp")
+@Validated
+@Slf4j
+public class WxMpController {
+
+    @Resource
+    private WxMpService mpService;
+
+    @PostMapping("/create-jsapi-signature")
+    @ApiOperation(value = "创建微信 JS SDK 初始化所需的签名",
+        notes = "参考 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html 文档")
+    public CommonResult<WxJsapiSignature> createJsapiSignature(@RequestParam("url") String url) throws WxErrorException {
+        return success(mpService.createJsapiSignature(url));
+    }
+
+}
--- a/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/package-info.java
+++ b/yudao-user-server/src/main/java/cn/iocoder/yudao/userserver/modules/weixin/package-info.java
@ -0,0 +1,7 @@
+/**
+ * weixin 包下，我们放通用业务，支撑上层的核心业务。
+ * 例如说：用户、部门、权限、数据字典等等
+ *
+ * 缩写：wx
+ */
+package cn.iocoder.yudao.userserver.modules.weixin;
--- a/yudao-user-server/src/main/resources/application-dev.yaml
+++ b/yudao-user-server/src/main/resources/application-dev.yaml
@ -138,6 +138,9 @@ yudao:
      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
  demo: true # 开启演示模式
+  pay:
+    pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify
+    refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify


 justauth:
--- a/yudao-user-server/src/main/resources/application-local.yaml
+++ b/yudao-user-server/src/main/resources/application-local.yaml
@ -121,6 +121,18 @@ logging:
  file:
    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径

+--- #################### 微信公众号相关配置 ####################
+wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
+  mp:
+    # 公众号配置(必填)
+    app-id: wx041349c6f39b268b
+    secret: 5abee519483bc9f8cb37ce280e814bd0
+    # 存储配置，解决 AccessToken 的跨节点的共享
+    config-storage:
+      type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
+      key-prefix: wx # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置
+      http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
+
 --- #################### 芋道相关配置 ####################

 # 芋道配置项，设置当前项目所有自定义的配置
@ -140,6 +152,9 @@ yudao:
      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
  demo: false # 关闭演示模式
+  pay:
+    pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify
+    refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify


 justauth:
--- a/yudao-user-server/src/main/resources/application.yaml
+++ b/yudao-user-server/src/main/resources/application.yaml
@ -20,6 +20,10 @@ spring:
      write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳
      fail-on-empty-beans: false # 允许序列化无属性的 Bean

+  # 静态资源
+  mvc:
+    static-path-pattern: /static/**
+
 # MyBatis Plus 的配置项
 mybatis-plus:
  configuration:
@ -33,6 +37,8 @@ mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  type-aliases-package: ${yudao.info.base-package}.modules.*.dal.dataobject, ${yudao.core-service.base-package}.modules.*.dal.dataobject

+
+
 --- #################### 芋道相关配置 ####################

 yudao:
--- a/yudao-user-server/src/main/resources/static/MP_verify_DKOvVzFP7vPwwHx2.txt
+++ b/yudao-user-server/src/main/resources/static/MP_verify_DKOvVzFP7vPwwHx2.txt
@ -0,0 +1 @@
+DKOvVzFP7vPwwHx2
--- a/yudao-user-server/src/main/resources/static/pay.html
+++ b/yudao-user-server/src/main/resources/static/pay.html
@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
+    <title>支付测试页</title>
+    <script src="https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.js"></script>
+    <script src="http://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+</head>
+<body>
+<div>点击如下按钮，发起支付的测试</div>
+<div>
+    <button id="wx_pub">微信公众号</button>
+</div>
+</body>
+<script>
+    let shopOrderId = undefined;
+    let payOrderId = undefined;
+    // let server = 'http://127.0.0.1:28080';
+    let server = 'http://niubi.natapp1.cc';
+    // TODO openid
+    let openid = "ockUAwIZ-0OeMZl9ogcZ4ILrGba0";
+    $(function() {
+        // 获得 JsapiTicket
+        // 参考 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html 文档
+        $.ajax({
+            url: server + "/api/wx/mp/create-jsapi-signature?url=" + document.location.href,
+            method: 'POST',
+            success: function( result ) {
+                if (result.code !== 0) {
+                    alert('获取 JsapiTicket 失败，原因：' + result.msg)
+                    return;
+                }
+                var jsapiTicket = result.data;
+                jsapiTicket.jsApiList = ['chooseWXPay'];
+                jsapiTicket.debug = false;
+
+                // 初始化 JS
+                wx.config(jsapiTicket);
+            }
+        });
+
+        // 自动发起商城订单编号
+        $.ajax({
+            url: server + "/api/shop/order/create",
+            method: 'POST',
+            success: function( result ) {
+                if (result.code !== 0) {
+                    alert('创建商城订单失败，原因：' + result.msg)
+                    return;
+                }
+                shopOrderId = result.data.id;
+                payOrderId = result.data.payOrderId;
+                console.log("商城订单：" + shopOrderId)
+                console.log("支付订单：" + payOrderId)
+            }
+        })
+    })
+
+    // 微信公众号
+    $( "#wx_pub").on( "click", function() {
+        if (typeof WeixinJSBridge == "undefined") {
+            // if (document.addEventListener) {
+            //     document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+            // } else if (document.attachEvent) {
+            //     document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+            //     document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+            // }
+            alert('微信支付，只支持在微信客户端中使用！');
+            return;
+        }
+        if (navigator.userAgent.indexOf('wechatdevtools') >= 0) {
+            alert('微信支付，无法在微信开发者工具中使用！请使用微信客户端！');
+            return;
+        }
+
+        // 提交支付
+        // 参考 https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6 文档
+        // 参考 https://segmentfault.com/a/1190000020704650 文档
+        $.ajax({
+            url: server + "/api/pay/order/submit",
+            method: 'POST',
+            dataType: "json",
+            contentType: "application/json",
+            data: JSON.stringify({
+                "id": payOrderId,
+                "channelCode": 'wx_pub',
+                "channelExtras": {
+                    "openid": openid
+                }
+            }),
+            success: function( result ) {
+                if (result.code !== 0) {
+                    alert('提交支付订单失败，原因：' + result.msg)
+                    return;
+                }
+                alert('点击确定，开始微信支付');
+                // 开始调用微信支付
+                let data = result.data.invokeResponse;
+                wx.chooseWXPay({
+                    timestamp: data.timeStamp,
+                    nonceStr: data.nonceStr,
+                    package: data.packageValue,
+                    signType: data.signType,
+                    paySign: data.paySign,
+                    success: function (res) {
+                        alert(JSON.stringify(res));
+                    },
+                    error: function(e) {
+                        alert(JSON.stringify(e));
+                    }
+                });
+            }
+        })
+    });
+</script>
+</html>