From a220be15e19f8f75c470ff2eba7968d15c226f90 Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Fri, 27 Jun 2025 17:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/common/CommonController.java | 4 ++-- .../web/controller/system/SysProfileController.java | 2 +- .../web/controller/xmComtroller/PayController.java | 10 +++++----- ruoyi-admin/src/main/resources/application-druid.yml | 4 ++-- ruoyi-admin/src/main/resources/application.yml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index cec5006e..bd3de57f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -72,7 +72,7 @@ public class CommonController /** * 通用上传请求（单个） */ - @PostMapping("/upload") +// @PostMapping("/upload") public AjaxResult uploadFile(MultipartFile file) throws Exception { try @@ -98,7 +98,7 @@ public class CommonController /** * 通用上传请求（多个） */ - @PostMapping("/uploads") +// @PostMapping("/uploads") public AjaxResult uploadFiles(List files) throws Exception { try diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 87a6e603..32fb497e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -119,7 +119,7 @@ public class SysProfileController extends BaseController * 头像上传 */ @Log(title = "用户头像", businessType = BusinessType.UPDATE) - @PostMapping("/avatar") +// @PostMapping("/avatar") public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception { if (!file.isEmpty()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java index dd082a65..b8ed79a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java @@ -118,8 +118,8 @@ public class PayController extends BaseController { model.setSubject("" + MCHNO + ""); model.setBody(orderTitle + "[" + MCHNO + "]"); - model.setNotifyUrl("http://62.234.19.34:8991/wxPay/result/wxRechargeCallback/" + type); //APP端回调地址 -// model.setNotifyUrl("https://cesuan.doni.link/wxPay/result/wxRechargeCallback/" + type); //微信端回调地址 +// model.setNotifyUrl("http://62.234.19.34:8991/wxPay/result/wxRechargeCallback/" + type); //APP端回调地址 + model.setNotifyUrl("https://cesuan.doni.link/wxPay/result/wxRechargeCallback/" + type); //微信端回调地址 model.setReturnUrl(""); model.setDivisionMode(divisionMode); //分账模式 @@ -127,9 +127,9 @@ public class PayController extends BaseController { JSONObject extParams = new JSONObject(); // 返回图片二维码url----------解除注释就是不返回支付地址，而是返回支付二维码--APP端支付 - if (StringUtils.isNotEmpty(payDataType)) { - extParams.put("payDataType", payDataType.trim()); - } +// if (StringUtils.isNotEmpty(payDataType)) { +// extParams.put("payDataType", payDataType.trim()); +// } if (StringUtils.isNotEmpty(authCode)) { extParams.put("authCode", authCode.trim()); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index e0c093db..a322606f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -10,10 +10,10 @@ spring: # url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 郑老师 - url: jdbc:mysql://172.17.0.4:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false +# url: jdbc:mysql://172.17.0.4:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false # # 测算腾讯云 mysql地址 -# url: jdbc:mysql://172.17.0.4:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://172.17.0.4:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false username: root password: dnxxkj # password: root diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ddf39743..6210fa6d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -77,9 +77,9 @@ spring: # redis 配置 redis: # 地址 郑老师腾讯云姓名学 - host: 172.17.0.5 +# host: 172.17.0.5 # 测算 腾讯云一年服务器 redis的地址 -# host: 172.17.0.3 + host: 172.17.0.3 # host: localhost # 端口，默认为6379 port: 6379