From 3d296470e90915ebe423ce3eaa8d5bf4e58c510f Mon Sep 17 00:00:00 2001 From: chenwei Date: Sat, 14 Sep 2024 15:27:40 +0800 Subject: [PATCH] update --- backend/assembly/src/main/resources/application-dev.yml | 20 +++++++++++++++++--- backend/auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java | 3 ++- backend/base/src/main/java/com/hotent/base/jwt/JwtAuthenticationResponse.java | 15 ++++++++++++--- backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java | 18 +++++++++++++----- backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java | 3 +-- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/backend/assembly/src/main/resources/application-dev.yml b/backend/assembly/src/main/resources/application-dev.yml index 1efc38f..b0b1137 100644 --- a/backend/assembly/src/main/resources/application-dev.yml +++ b/backend/assembly/src/main/resources/application-dev.yml @@ -5,18 +5,28 @@ spring: dynamic: datasource: master: - #开发环境配置 +# #开发环境配置 username: root password: Peony2021 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://123.60.140.65:10002/lpg_dev?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true - #生产环境配置 +# 生产环境配置 # username: root # password: Carbon@2024 # driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://localhost:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true +# 生产环境配置2 +# username: root +# password: Carbon@2024 +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:13307/lpg_dev?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true + + + + + druid: filters: stat @@ -201,5 +211,9 @@ jdbcParam: jdbcurl: jdbc:mysql://123.60.140.65:10002/lpg_dev username: root password: Peony2021 + ygxx: - ewm: /pages/scanCodeUserInfo/index/ \ No newline at end of file + ewm: /pages/scanCodeUserInfo/index/ + +payment: + hostUrl: https://lpg.ip-server.cn/lpg_test/api diff --git a/backend/auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java b/backend/auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java index 71b6b94..d72fd38 100644 --- a/backend/auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java +++ b/backend/auth-server/src/main/java/com/hotent/auth/server/service/impl/AuthenticationServiceImpl.java @@ -412,7 +412,8 @@ public class AuthenticationServiceImpl implements AuthenticationService { //处理单用户登录 handleSingleLogin(isMobile, tenantId, account, token); // Return the token - return ResponseEntity.ok(new JwtAuthenticationResponse(token, userName, account, userId)); + JwtAuthenticationResponse jwtAuthenticationResponse = new JwtAuthenticationResponse(token, userName, account, userId,openid); + return ResponseEntity.ok(jwtAuthenticationResponse); }else { if(StringUtil.isNotEmpty(openid)) { return ResponseEntity.ok(new JwtAuthenticationResponse(openid)); diff --git a/backend/base/src/main/java/com/hotent/base/jwt/JwtAuthenticationResponse.java b/backend/base/src/main/java/com/hotent/base/jwt/JwtAuthenticationResponse.java index 899ae60..a591f62 100644 --- a/backend/base/src/main/java/com/hotent/base/jwt/JwtAuthenticationResponse.java +++ b/backend/base/src/main/java/com/hotent/base/jwt/JwtAuthenticationResponse.java @@ -15,9 +15,18 @@ public class JwtAuthenticationResponse implements Serializable { private String openid; private Long expiration; private boolean loginStatus = true; - + private Map userAttrs = new HashMap(); + public JwtAuthenticationResponse(String token, String username,String account,String userId,String openid) { + this.token = token; + this.username = username; + this.account = account; + this.userId = userId; + this.openid = openid; + } + + public JwtAuthenticationResponse(String token, String username,String account,String userId) { this.token = token; this.username = username; @@ -56,7 +65,7 @@ public class JwtAuthenticationResponse implements Serializable { public String getToken() { return this.token; } - + public String getUsername() { return this.username; } @@ -84,5 +93,5 @@ public class JwtAuthenticationResponse implements Serializable { public void setUserAttrs(Map userAttrs) { this.userAttrs = userAttrs; } - + } diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java index ea95cfc..e3c4f5b 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/WxPayManagerImpl.java @@ -26,12 +26,14 @@ import com.hotent.lpg.user.util.LocalDateTimeUtils; import com.hotent.lpg.user.util.WxPayConfiguration; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.InputSource; +import javax.annotation.Resource; import javax.xml.bind.JAXBContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -49,12 +51,18 @@ import java.time.LocalDateTime; import java.util.HashMap; @Service -@AllArgsConstructor @Slf4j public class WxPayManagerImpl implements WxPayManager { - private final DdDao ddDao; - private final CzzfpzDao czzfpzDao; + + @Value("${payment.hostUrl}") + private String hostUrl; + + @Resource + private DdDao ddDao; + + @Resource + private CzzfpzDao czzfpzDao; /** * 发起退款请求 @@ -91,7 +99,7 @@ public class WxPayManagerImpl implements WxPayManager { refundRequest.setOutRefundNo(RandomUtil.randomString(32)); // 退款单号 refundRequest.setTotalFee(wDd.getFDdje().multiply(new BigDecimal(100)).intValue()); // 订单总金额 refundRequest.setRefundFee(wDd.getFDdje().multiply(new BigDecimal(100)).intValue()); // 退款金额 - refundRequest.setNotifyUrl(WxPayConfiguration.hostUrl + "/user/wxPay/handleRefundSuccessCallback"); + refundRequest.setNotifyUrl(hostUrl + "/user/wxPay/handleRefundSuccessCallback"); // 发起退款请求 Object payment = wxPayService.refund(refundRequest); // 返回结果 @@ -236,7 +244,7 @@ public class WxPayManagerImpl implements WxPayManager { scene_info.put("id", "LPG"); scene_info.put("name", "燃气"); wxPayUnifiedOrderRequest.setSceneInfo(scene_info.toString()); - wxPayUnifiedOrderRequest.setNotifyUrl(WxPayConfiguration.hostUrl + "/user/wxPay/handlePaySuccessCallback"); // 支付回调地址，开放不用登录 + wxPayUnifiedOrderRequest.setNotifyUrl(hostUrl + "/user/wxPay/handlePaySuccessCallback"); // 支付回调地址，开放不用登录 wxPayUnifiedOrderRequest.setSpbillCreateIp("127.0.0.1"); // trade_type=APP时 移动应用内的支付场景 if ("APP".equals(wxPayUnifiedOrderRequest.getTradeType())) { diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java index 0ae53e1..10bd5cd 100644 --- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java +++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/util/WxPayConfiguration.java @@ -4,11 +4,10 @@ import com.github.binarywang.wxpay.config.WxPayConfig; import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl; import com.hotent.lpg.common.model.WCzzfpz; +import org.springframework.beans.factory.annotation.Value; public class WxPayConfiguration { - - public static final String hostUrl = "https://lpg.ip-server.cn/api"; public static WxPayService getPayService(WCzzfpz wCzzfpz) { WxPayConfig wxPayConfig = new WxPayConfig(); wxPayConfig.setAppId(wCzzfpz.getFAppid()); // appId（应用id）（微信支付商户平台获取） -- libgit2 0.21.2