From 8ae4dc76465c03da8602c528466e6a5a5ca8017e Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Tue, 14 Sep 2021 11:49:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88=E8=B7=A8=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E7=94=A8=E6=A0=A1=E9=AA=8C=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayPaymentRecordServiceImpl.java | 25 ++++++++++++++++--- .../java/com/jero/util/standardsUtil.java | 17 +++++++------ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 2f0c3622..8f9603a9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -1,6 +1,9 @@ package com.jero.payment.service.impl; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -11,6 +14,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.RestUtil; import com.jero.common.util.oConvertUtils; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.meeting.entity.PayMeetingSituation; @@ -27,6 +31,7 @@ import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.mapper.PayCommonProjectMapper; import com.jero.project.mapper.PayWorkingGroupSubItemMapper; +import com.jero.util.standardsUtil; import io.lettuce.core.dynamic.annotation.Param; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; @@ -42,12 +47,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.text.DecimalFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -73,6 +76,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl mainList(Page page, PayCommonProject payCommonProject){ + //使用公钥加密token + byte[] bytes = standardsUtil.encryptByRsaPriKey(); + //从标协项目获取公钥 + String publicKey = HttpUtil.get("http://localhost:8080/api/authenticationUtils/getPublicKey"); + + HashMap paramMap = new HashMap<>(); + + paramMap.put("token", Base64.getEncoder().encodeToString(bytes)); + paramMap.put("publicKey", publicKey); + + String result3= HttpUtil.get("http://localhost:8080/api/paymentInfo/incomingPaymentCheck", paramMap); + return payPaymentRecordMapper.mainList(page, payCommonProject); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/standardsUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/standardsUtil.java index 0b9f6784..f6c709b6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/util/standardsUtil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/standardsUtil.java @@ -1,5 +1,7 @@ package com.jero.util; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.http.HttpUtil; @@ -19,7 +21,7 @@ public class standardsUtil { private static String token; public static String getRSAPublicKey(){ - JSONObject jsonObject = RestUtil.get(url + "/sys/getRSAPublicKey"); + JSONObject jsonObject = RestUtil.get(url + "/commonUtils/getRSAPublicKey"); if (jsonObject.getBoolean("success")) { return jsonObject.getString("result"); }else { @@ -30,13 +32,14 @@ public class standardsUtil { /** * RSA 使用公钥加密token - * @param RSAPublicKey 公钥 - * @return String 加密后的字符串 */ - public static String encryptByRsaPriKey(String RSAPublicKey) { - RSA rsa = new RSA(null, RSAPublicKey); - byte[] encrypt = rsa.encrypt(token, KeyType.PublicKey); - return new String(encrypt); + public static byte[] encryptByRsaPriKey() { + //从标协项目获取公钥 + String publicKey=HttpUtil.get("http://localhost:8080/api/authenticationUtils/getPublicKey"); + + RSA rsa = new RSA(null,publicKey); + + return rsa.encrypt(StrUtil.bytes("Aa123456!!", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey); } }