From ba55ca2faa3536021cecc7acb56ed0637ee6be52 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 15 Sep 2021 11:07:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=8A=E4=BC=9A=E5=91=98=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95=E5=8F=98=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingSituationController.java |  1 +
 .../service/impl/PayPaymentRecordServiceImpl.java |  4 +---
 .../java/com/jero/util/AuthenticationUtils.java   | 15 +++++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 685d8793..d2d4367e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -195,4 +195,5 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
 		 return Result.OK("合并开票成功!");
 	 }
 
+
 }
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 28671535..39ccbb25 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
@@ -73,8 +73,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
     @Resource
     private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
-    @Resource
-    private AuthenticationUtils authenticationUtils;
 
     @Value("${jero.path.upload}")
     private String upLoadPath;
@@ -337,7 +335,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      */
     private void sendToStandards(TbMemberProjectSubitem tbMember,PayPaymentRecord payPaymentRecord){
         //获取公钥并使用公钥加密token
-        Map<String, String> map = authenticationUtils.encryptByRsaPriKey();
+        Map<String, String> map = AuthenticationUtils.encryptByRsaPriKey();
 
         HashMap<String, Object> paramMap = new HashMap<>();
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/AuthenticationUtils.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/AuthenticationUtils.java
index 3e9ae3ba..e733ffdd 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/util/AuthenticationUtils.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/AuthenticationUtils.java
@@ -21,16 +21,23 @@ import java.util.Map;
 @Component
 public class AuthenticationUtils {
 
-    @Value("${standards.url}")
-    private String URL;
+    private static String URL;
 
+    private static String APPLICATION_TOKEN;
+
+    @Value("${standards.url}")
+    public void setURL(String URL) {
+        AuthenticationUtils.URL = URL;
+    }
     @Value("${standards.token}")
-    private String APPLICATION_TOKEN;
+    public void setApplicationToken(String applicationToken) {
+        APPLICATION_TOKEN = applicationToken;
+    }
 
     /**
      * 获取公钥并使用公钥加密token
      */
-    public Map<String,String> encryptByRsaPriKey() {
+    public static Map<String,String> encryptByRsaPriKey() {
 
         Map<String,String> map= new HashMap<>();
         //从标协项目获取公钥