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

Conflicts: yudao-dependencies/pom.xml yudao-framework/pom.xml
2025-08-10 00:01:53 +08:00 · 2021-10-30 10:24:58 +08:00
parent 436781507e 8cead0869e
commit 0050b1e46d
243 changed files with 8264 additions and 468 deletions
--- a/yudao-admin-server/src/main/resources/application-local.yaml
+++ b/yudao-admin-server/src/main/resources/application-local.yaml
@@ -180,6 +180,9 @@ yudao:
    exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
+  pay:
+    pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify
+    refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify
  demo: false # 关闭演示模式

 justauth: