zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-13 22:09:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ Upgrading dependencies. 更新 spring boot 、spring cloud 、mp 、pay 依赖

Browse Source 
⬆️ Upgrading dependencies. 更新 spring boot 、spring cloud 、mp 、pay 依赖
This commit is contained in:
冷冷 committed 2020-08-04 11:56:42 +08:00
1 parent ec3bbd900e
commit cf0db9c132
44 files changed
+109 -113
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-codegen/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-codegen</artifactId>
pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenDatasourceConfServiceImpl.java
+2 -2
View File
@@ -117,14 +117,14 @@ public class GenDatasourceConfServiceImpl extends ServiceImpl<GenDatasourceConfM
@Override
public void addDynamicDataSource(GenDatasourceConf conf) {
DataSourceProperty dataSourceProperty = new DataSourceProperty();
dataSourceProperty.setPollName(conf.getName());
dataSourceProperty.setPoolName(conf.getName());
dataSourceProperty.setUrl(conf.getUrl());
dataSourceProperty.setUsername(conf.getUsername());
dataSourceProperty.setPassword(conf.getPassword());
DataSource dataSource = dataSourceCreator.createDataSource(dataSourceProperty);
DynamicRoutingDataSource dynamicRoutingDataSource = SpringContextHolder.getBean(DynamicRoutingDataSource.class);
dynamicRoutingDataSource.addDataSource(dataSourceProperty.getPollName(), dataSource);
dynamicRoutingDataSource.addDataSource(dataSourceProperty.getPoolName(), dataSource);
}
/**
pigx-visual/pigx-daemon-elastic-job/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
pigx-visual/pigx-daemon-quartz/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-visual/pigx-monitor/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-monitor</artifactId>
pigx-visual/pigx-mp-platform/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-mp-platform</artifactId>
pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/config/WxMpInRedisConfigStorage.java
+1 -1
View File
@@ -16,8 +16,8 @@
package com.pig4cloud.pigx.mp.config;
import me.chanjar.weixin.common.enums.TicketType;
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
import me.chanjar.weixin.mp.enums.TicketType;
import org.springframework.data.redis.core.RedisTemplate;
import java.util.concurrent.TimeUnit;
pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java
+3 -5
View File
@@ -95,8 +95,7 @@ public class WxMaterialController {
public R materialNewsUpload(@RequestBody JSONObject data) {
try {
JSONArray jSONArray = data.getJSONArray("articles");
List<WxMpMaterialNews.WxMpMaterialNewsArticle> articles = jSONArray
.toList(WxMpMaterialNews.WxMpMaterialNewsArticle.class);
List<WxMpNewsArticle> articles = jSONArray.toList(WxMpNewsArticle.class);
WxMpMaterialNews news = new WxMpMaterialNews();
news.setArticles(articles);
@@ -127,15 +126,14 @@ public class WxMaterialController {
try {
String mediaId = data.getStr("mediaId");
JSONArray jSONArray = data.getJSONArray("articles");
List<WxMpMaterialNews.WxMpMaterialNewsArticle> articles = jSONArray
.toList(WxMpMaterialNews.WxMpMaterialNewsArticle.class);
List<WxMpNewsArticle> articles = jSONArray.toList(WxMpNewsArticle.class);
String appId = data.getStr("appId");
WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId);
WxMpMaterialService wxMpMaterialService = wxMpService.getMaterialService();
WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate = new WxMpMaterialArticleUpdate();
wxMpMaterialArticleUpdate.setMediaId(mediaId);
int index = 0;
for (WxMpMaterialNews.WxMpMaterialNewsArticle article : articles) {
for (WxMpNewsArticle article : articles) {
wxMpMaterialArticleUpdate.setIndex(index);
wxMpMaterialArticleUpdate.setArticles(article);
wxMpMaterialService.materialNewsUpdate(wxMpMaterialArticleUpdate);
pigx-visual/pigx-oa-platform/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-oa-platform</artifactId>
pigx-visual/pigx-pay-platform/pom.xml
+4 -4
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-pay-platform</artifactId>
@@ -80,11 +80,11 @@
<!-- 支付依赖-->
<dependency>
<groupId>com.github.javen205</groupId>
<artifactId>IJPay</artifactId>
<artifactId>IJPay-WxPay</artifactId>
</dependency>
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>alipay-sdk-java</artifactId>
<groupId>com.github.javen205</groupId>
<artifactId>IJPay-AliPay</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java
+10 -11
View File
@@ -6,10 +6,10 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.annotation.SqlParser;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jpay.alipay.AliPayApiConfig;
import com.jpay.alipay.AliPayApiConfigKit;
import com.jpay.weixin.api.WxPayApiConfig;
import com.jpay.weixin.api.WxPayApiConfigKit;
import com.ijpay.alipay.AliPayApiConfig;
import com.ijpay.alipay.AliPayApiConfigKit;
import com.ijpay.wxpay.WxPayApiConfig;
import com.ijpay.wxpay.WxPayApiConfigKit;
import com.pig4cloud.pigx.admin.api.feign.RemoteTenantService;
import com.pig4cloud.pigx.common.core.constant.CacheConstants;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
@@ -75,9 +75,9 @@ public class PayConfigParmaInitRunner {
// 支付宝支付
if (PayChannelNameEnum.ALIPAY_WAP.getName().equals(channel.getChannelId())) {
AliPayApiConfig aliPayApiConfig = AliPayApiConfig.New().setAppId(channel.getAppId())
AliPayApiConfig aliPayApiConfig = AliPayApiConfig.builder().setAppId(channel.getAppId())
.setPrivateKey(params.getStr("privateKey")).setCharset(CharsetUtil.UTF_8)
.setAlipayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl"))
.setAliPayPublicKey(params.getStr("publicKey")).setServiceUrl(params.getStr("serviceUrl"))
.setSignType("RSA2").build();
AliPayApiConfigKit.putApiConfig(aliPayApiConfig);
@@ -86,14 +86,13 @@ public class PayConfigParmaInitRunner {
// 微信支付
if (PayChannelNameEnum.WEIXIN_MP.getName().equals(channel.getChannelId())) {
WxPayApiConfig wx = WxPayApiConfig.New().setAppId(channel.getAppId())
.setMchId(channel.getChannelMchId()).setPaternerKey(params.getStr("paternerKey"))
.setPayModel(WxPayApiConfig.PayModel.BUSINESSMODEL);
WxPayApiConfig wx = WxPayApiConfig.builder().appId(channel.getAppId()).mchId(channel.getChannelMchId())
.partnerKey(params.getStr("paternerKey")).build();
String subMchId = params.getStr("subMchId");
if (StrUtil.isNotBlank(subMchId)) {
wx.setPayModel(WxPayApiConfig.PayModel.SERVICEMODE);
wx.setSubMchId(subMchId);
wx.setSlAppId(channel.getAppId());
wx.setSlMchId(subMchId);
}
WxPayApiConfigKit.putApiConfig(wx);
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
+1 -1
View File
@@ -19,7 +19,7 @@ package com.pig4cloud.pigx.pay.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jpay.weixin.api.WxPayApiConfigKit;
import com.ijpay.wxpay.WxPayApiConfigKit;
import com.pig4cloud.pigx.common.core.util.R;
import com.pig4cloud.pigx.common.log.annotation.SysLog;
import com.pig4cloud.pigx.common.security.annotation.Inner;
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java
+4 -4
View File
@@ -19,9 +19,9 @@ package com.pig4cloud.pigx.pay.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jpay.alipay.AliPayApi;
import com.jpay.ext.kit.HttpKit;
import com.jpay.ext.kit.PaymentKit;
import com.ijpay.alipay.AliPayApi;
import com.ijpay.core.kit.HttpKit;
import com.ijpay.core.kit.WxPayKit;
import com.pig4cloud.pigx.common.core.util.R;
import com.pig4cloud.pigx.common.log.annotation.SysLog;
import com.pig4cloud.pigx.common.security.annotation.Inner;
@@ -141,7 +141,7 @@ public class PayNotifyRecordController {
public String wxCallbak(HttpServletRequest request) {
String xmlMsg = HttpKit.readData(request);
log.info("微信订单回调信息:{}", xmlMsg);
Map<String, String> params = PaymentKit.xmlToMap(xmlMsg);
Map<String, String> params = WxPayKit.xmlToMap(xmlMsg);
return weChatCallback.handle(params);
}
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java
+3 -3
View File
@@ -24,8 +24,8 @@ import cn.hutool.core.util.StrUtil;
import com.alipay.api.AlipayApiException;
import com.alipay.api.internal.util.AlipaySignature;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jpay.alipay.AliPayApiConfig;
import com.jpay.alipay.AliPayApiConfigKit;
import com.ijpay.alipay.AliPayApiConfig;
import com.ijpay.alipay.AliPayApiConfigKit;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
import com.pig4cloud.pigx.pay.entity.PayNotifyRecord;
@@ -116,7 +116,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand
}
try {
return AlipaySignature.rsaCheckV1(params, apiConfig.getAlipayPublicKey(), CharsetUtil.UTF_8, "RSA2");
return AlipaySignature.rsaCheckV1(params, apiConfig.getAliPayPublicKey(), CharsetUtil.UTF_8, "RSA2");
}
catch (AlipayApiException e) {
log.error("支付宝验签失败", e);
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java
+2 -2
View File
@@ -21,8 +21,8 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.extra.servlet.ServletUtil;
import com.alipay.api.AlipayApiException;
import com.alipay.api.domain.AlipayTradeWapPayModel;
import com.jpay.alipay.AliPayApi;
import com.jpay.alipay.AliPayApiConfigKit;
import com.ijpay.alipay.AliPayApi;
import com.ijpay.alipay.AliPayApiConfigKit;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.pay.config.PayCommonProperties;
import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatMpPayOrderHandler.java
+26 -20
View File
@@ -18,9 +18,13 @@
package com.pig4cloud.pigx.pay.handler.impl;
import cn.hutool.extra.servlet.ServletUtil;
import com.jpay.ext.kit.PaymentKit;
import com.jpay.weixin.api.WxPayApi;
import com.jpay.weixin.api.WxPayApiConfigKit;
import com.ijpay.core.enums.SignType;
import com.ijpay.core.enums.TradeType;
import com.ijpay.core.kit.WxPayKit;
import com.ijpay.wxpay.WxPayApi;
import com.ijpay.wxpay.WxPayApiConfig;
import com.ijpay.wxpay.WxPayApiConfigKit;
import com.ijpay.wxpay.model.UnifiedOrderModel;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.pay.config.PayCommonProperties;
import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
@@ -29,8 +33,8 @@ import com.pig4cloud.pigx.pay.mapper.PayGoodsOrderMapper;
import com.pig4cloud.pigx.pay.mapper.PayTradeOrderMapper;
import com.pig4cloud.pigx.pay.utils.OrderStatusEnum;
import com.pig4cloud.pigx.pay.utils.PayChannelNameEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -44,19 +48,16 @@ import java.util.Map;
*/
@Slf4j
@Service("WEIXIN_MP")
@RequiredArgsConstructor
public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler {
@Autowired
private PayCommonProperties payCommonProperties;
private final PayCommonProperties payCommonProperties;
@Autowired
private PayTradeOrderMapper tradeOrderMapper;
private final PayTradeOrderMapper tradeOrderMapper;
@Autowired
private PayGoodsOrderMapper goodsOrderMapper;
private final PayGoodsOrderMapper goodsOrderMapper;
@Autowired
private HttpServletRequest request;
private final HttpServletRequest request;
/**
* 创建交易订单
@@ -86,18 +87,23 @@ public class WeChatMpPayOrderHandler extends AbstractPayOrderHandler {
@Override
public Object pay(PayGoodsOrder goodsOrder, PayTradeOrder tradeOrder) {
String ip = ServletUtil.getClientIP(request);
Map<String, String> params = WxPayApiConfigKit.getWxPayApiConfig()
.setAttach(TenantContextHolder.getTenantId().toString()).setBody(goodsOrder.getGoodsName())
.setSpbillCreateIp(ip).setTotalFee(goodsOrder.getAmount()).setOpenId(goodsOrder.getUserId())
.setTradeType(WxPayApi.TradeType.JSAPI)
.setNotifyUrl(payCommonProperties.getWxPayConfig().getNotifyUrl())
.setOutTradeNo(tradeOrder.getOrderId()).build();
WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig();
// 预订单参数
Map<String, String> params = UnifiedOrderModel.builder().appid(wxPayApiConfig.getAppId())
.mch_id(wxPayApiConfig.getMchId()).nonce_str(WxPayKit.generateStr()).body(goodsOrder.getGoodsName())
.attach(TenantContextHolder.getTenantId().toString()).out_trade_no(tradeOrder.getOrderId())
.total_fee(goodsOrder.getAmount()).spbill_create_ip(ip)
.notify_url(payCommonProperties.getWxPayConfig().getNotifyUrl())
.trade_type(TradeType.JSAPI.getTradeType()).openid(goodsOrder.getUserId()).build()
.createSign(wxPayApiConfig.getPartnerKey(), SignType.HMACSHA256);
String xmlResult = WxPayApi.pushOrder(false, params);
log.info(xmlResult);
Map<String, String> resultMap = PaymentKit.xmlToMap(xmlResult);
Map<String, String> resultMap = WxPayKit.xmlToMap(xmlResult);
String prepayId = resultMap.get("prepay_id");
return PaymentKit.prepayIdCreateSign(prepayId);
return WxPayKit.prepayIdCreateSign(prepayId, wxPayApiConfig.getAppId(), wxPayApiConfig.getPartnerKey(),
SignType.HMACSHA256);
}
/**
pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/handler/impl/WeChatPayNotifyCallbackHandler.java
+4 -4
View File
@@ -20,8 +20,8 @@ package com.pig4cloud.pigx.pay.handler.impl;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.EnumUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jpay.ext.kit.PaymentKit;
import com.jpay.weixin.api.WxPayApiConfigKit;
import com.ijpay.core.kit.WxPayKit;
import com.ijpay.wxpay.WxPayApiConfigKit;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.pay.entity.PayGoodsOrder;
import com.pig4cloud.pigx.pay.entity.PayNotifyRecord;
@@ -91,7 +91,7 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand
*/
@Override
public Boolean verifyNotify(Map<String, String> params) {
if (!PaymentKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getPaternerKey())) {
if (!WxPayKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getApiKey())) {
log.warn("微信支付回调验签失败", params);
return null;
}
@@ -128,7 +128,7 @@ public class WeChatPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand
Map<String, String> xml = new HashMap<>(4);
xml.put("return_code", "SUCCESS");
xml.put("return_msg", "OK");
return PaymentKit.toXml(xml);
return WxPayKit.toXml(xml);
}
/**
pigx-visual/pigx-sentinel-dashboard/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-sentinel-dashboard</artifactId>
pigx-visual/pigx-sso-client-demo/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<dependencies>
pigx-visual/pigx-tx-manager/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
pigx-visual/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.9.0</version>
<version>3.10.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-visual</artifactId>