From a850d071d4045ee4fafc03deb5f6f96d5eb43abd Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 22 Feb 2025 18:22:53 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E8=B7=AF=E5=BE=84=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 3 ++- admin-hanhai-vue/.env.production | 3 ++- .../src/main/java/org/jeecg/modules/pay/MpWxPayService.java | 4 ++-- jeecg-boot-module-system/pom.xml | 2 +- jeecg-boot-module-system/src/main/resources/application-dev.yml | 2 +- jeecg-boot-module-system/src/main/resources/pay_weixin.properties | 4 ++-- .../main/resources/static/generic/web/locale/zh-CN/viewer.properties | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index c610a8c..a570af3 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -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 diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 084c8ef..e604031 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -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 \ No newline at end of file diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index 9299df2..bb190d4 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -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); diff --git a/jeecg-boot-module-system/pom.xml b/jeecg-boot-module-system/pom.xml index c0a2f5b..65a800d 100644 --- a/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot-module-system/pom.xml @@ -77,7 +77,7 @@ - employ-admin + employ-api org.springframework.boot diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 59f6b61..c27ea36 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -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 diff --git a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties index d91397c..1799351 100644 --- a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties +++ b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties @@ -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 diff --git a/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties b/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties index 4dee942..e2b4405 100644 --- a/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties +++ b/jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties @@ -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=打印