diff --git a/Cpop-Common/src/main/java/com/cpop/common/utils/ServletUtils.java b/Cpop-Common/src/main/java/com/cpop/common/utils/ServletUtils.java index 8a847d9..51e7dd1 100644 --- a/Cpop-Common/src/main/java/com/cpop/common/utils/ServletUtils.java +++ b/Cpop-Common/src/main/java/com/cpop/common/utils/ServletUtils.java @@ -2,7 +2,6 @@ package com.cpop.common.utils; import com.alibaba.fastjson.JSONObject; import com.cpop.common.utils.text.Convert; -import com.sun.xml.internal.ws.util.UtilException; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -57,7 +56,7 @@ public class ServletUtils { } parameter = json.getString(name); } catch (IOException e) { - throw new UtilException("获取分页参数失败!"); + throw new RuntimeException("获取分页参数失败!"); } } return Convert.toInt(parameter); diff --git a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-prod.yml b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-prod.yml index 5fe3a7e..bcb1eb1 100644 --- a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-prod.yml +++ b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-prod.yml @@ -1,17 +1,17 @@ # 项目相关配置 cpop: # 文件路径 示例( Windows配置W:/WorkSpace/java/uploadPath,Linux配置 /home/baseFramework/uploadPath) - profile: /root/jambox-union/jambox-oam/uploadPath/upload + profile: /root/cpop-union/cpop-mall/upload jwt: #白名单 - whiteList: /login,/getCaptcha,/profile/**,/wxOpen/receiveTicket,/wxOpen/*/callback,/wxOpen/bindOpenAccount/*,/wxCp/portal/* + whiteList: /login,/miniLogin,/wxPay/callback/notify/**,/profile/** #拦截 gateway: rsa-keypair: # 公钥文件 - publicKeyFile: /root/jambox-union/jambox-oam/script/secretKey/publicKey + publicKeyFile: /root/cpop-union/cpop-mall/script/secretKey/publicKey # 公钥文件 - privateKeyFile: /root/jambox-union/jambox-oam/script/secretKey/privateKey + privateKeyFile: /root/cpop-union/cpop-mall/script/secretKey/privateKey # DataSource Config spring: @@ -24,7 +24,7 @@ spring: #端口 port: 6333 #数据库 - database: 5 + database: 10 #密码 password: Jambox.123* #连接超时 @@ -60,11 +60,11 @@ mybatis-flex: log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl datasource: mall: - url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/cpop-union?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/cpop_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: Customer0401 jambox: - url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/jambox_association?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://sh-cynosdbmysql-grp-fggo83js.sql.tencentcdb.com:20965/jambox_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: Customer0401 @@ -76,4 +76,6 @@ logging: wx: pay: #通知地址 - notifyUrl: \ No newline at end of file + notifyUrl: https://test.cpopsz.com/onlineShop/Cpop-Mall/wxPay/callback/notify/order + #支付成功 + notifyRefund: https://test.cpopsz.com/onlineShop/Cpop-Mall/wxPay/callback/notify/refund \ No newline at end of file diff --git a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-test.yml b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-test.yml index 2fdb75a..bf35cd7 100644 --- a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-test.yml +++ b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application-test.yml @@ -100,4 +100,6 @@ logging: wx: pay: #通知地址 - notifyUrl: https://frp-oak.top:11899/Cpop-Mall/wxPay/callback/notify/order \ No newline at end of file + notifyUrl: https://frp-oak.top:11899/Cpop-Mall/wxPay/callback/notify/order + #支付成功 + notifyRefund: https://frp-oak.top:11899/Cpop-Mall/wxPay/callback/notify/refund \ No newline at end of file diff --git a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application.yml b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application.yml index dc90df2..64c715d 100644 --- a/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application.yml +++ b/Cpop-Mall/Cpop-Mall-Web/src/main/resources/application.yml @@ -31,7 +31,7 @@ spring: max-file-size: 1024MB max-request-size: 300MB profiles: - active: test,mall,system + active: prod,mall,system datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java index 1e31f3c..50e0492 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java @@ -27,6 +27,7 @@ import com.cpop.mall.business.entity.OrderRefund; import com.cpop.mall.business.mapper.OrderRefundMapper; import com.cpop.mall.business.service.OrderRefundService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER; @@ -48,6 +49,9 @@ public class OrderRefundServiceImpl extends ServiceImpl detailList; +} diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/framework/config/wxPay/WxPayProperties.java b/Cpop-Mall/src/main/java/com/cpop/mall/framework/config/wxPay/WxPayProperties.java index 3916d82..c912771 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/framework/config/wxPay/WxPayProperties.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/framework/config/wxPay/WxPayProperties.java @@ -62,7 +62,12 @@ public class WxPayProperties { private String certSerialNo; /** - * 通知地址 + * 支付通知地址 */ private String notifyUrl; + + /** + * 退款通知 + */ + private String notifyRefund; }