Browse Source

1、修改支付回调路径

2、修改项目名称
master
Aug 3 months ago
parent
commit
a850d071d4
7 changed files with 11 additions and 9 deletions
  1. +2
    -1
      admin-hanhai-vue/.env.development
  2. +2
    -1
      admin-hanhai-vue/.env.production
  3. +2
    -2
      han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java
  4. +1
    -1
      jeecg-boot-module-system/pom.xml
  5. +1
    -1
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  6. +2
    -2
      jeecg-boot-module-system/src/main/resources/pay_weixin.properties
  7. +1
    -1
      jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties

+ 2
- 1
admin-hanhai-vue/.env.development View File

@ -1,5 +1,6 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8000/employ-admin/
VUE_APP_API_BASE_URL=https://employadmin.hhlm1688.com/employ-api/
//VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 2
- 1
admin-hanhai-vue/.env.production View File

@ -1,4 +1,5 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=http://localhost:8000/employ-admin/
VUE_APP_API_BASE_URL=https://employadmin.hhlm1688.com/employ-api/
//VUE_APP_API_BASE_URL=http://localhost:8000/employ-api/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 2
- 2
han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java View File

@ -99,13 +99,13 @@ public class MpWxPayService {
request.setTotalFee(price); //总金额|分计
request.setSpbillCreateIp(clientIp); //终端IP
// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
request.setNotifyUrl("https://admin.augcl.com/employ-admin/employ/amount/payNotify");//设置回调路径
request.setNotifyUrl("https://employadmin.hhlm1688.com/employ-api/employ/amount/payNotify");//设置回调路径
request.setProductId(productId); //商品id
request.setOpenid(openId); //JSAPI OPENID
if (dev){
request.setTotalFee(price);
// request.setNotifyUrl(wxPay.notifyUrlDev);
request.setNotifyUrl("http://augcl.natapp1.cc/employ-admin/employ/amount/payNotify");//设置回调路径
request.setNotifyUrl("http://augcl.natapp1.cc/employ-api/employ/amount/payNotify");//设置回调路径
}
try {
Object order = wxPayService.createOrder(request);


+ 1
- 1
jeecg-boot-module-system/pom.xml View File

@ -77,7 +77,7 @@
</dependencies>
<build>
<finalName>employ-admin</finalName>
<finalName>employ-api</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>


+ 1
- 1
jeecg-boot-module-system/src/main/resources/application-dev.yml View File

@ -7,7 +7,7 @@ server:
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /employ-admin
context-path: /employ-api
compression:
enabled: true
min-response-size: 1024


+ 2
- 2
jeecg-boot-module-system/src/main/resources/pay_weixin.properties View File

@ -2,7 +2,7 @@ pay.mchId=1704045304
pay.appId=wx6931d85f7371b032
pay.mchKey=0fdb77429ffdf206c151af76a663041c
pay.keyPath=classpath:apiclient_cert.pem
pay.notifyUrl=https://admin.augcl.com/employ-admin/employ/amount/payNotify
pay.notifyUrlDev=http://augcl.natapp1.cc/employ-admin/employ/amount/payNotify
pay.notifyUrl=https://admin.augcl.com/employ-api/employ/amount/payNotify
pay.notifyUrlDev=http://augcl.natapp1.cc/employ-api/employ/amount/payNotify

+ 1
- 1
jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties View File

@ -32,7 +32,7 @@ zoom_in_label=放大
zoom.title=缩放
presentation_mode.title=切换到演示模式
presentation_mode_label=演示模式
open_file.title=employ-admin文件
open_file.title=employ-api文件
open_file_label=打开
print.title=打印
print_label=打印


Loading…
Cancel
Save