From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
index 87256fa..4635542 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wxpay/UsrWxPayConfigService.java
@@ -42,9 +42,10 @@
         WxConfigEntity config;
         //鏈缃敮浠樺弬鏁帮紝鍒欎娇鐢ㄩ粯璁ゆ敮浠樺弬鏁�
         config = getOne(Wrappers.lambdaQuery(WxConfigEntity.class).eq(WxConfigEntity::getClientId, pole.getClientId()).eq(WxConfigEntity::getState, 1));
-        if (pole.getClientId() == null) {
-            config = getById(15);  // todo 鏆傛椂鍐欐锛屽悗缁渶瑕佹敼鎴愰厤缃枃浠�
-        }
+//        if (pole.getClientId() == null) {
+              //娌℃湁褰掑睘鐨勭伅鏉嗕娇鐢ㄩ粯璁ら厤缃�
+//            config = getById(15);
+//        }
         if (config == null) {
             throw new BusinessException("鐢ㄦ埛鏈厤缃敮浠橀厤缃�,璇烽厤缃悗閲嶈瘯");
         }
@@ -63,12 +64,12 @@
         config.setAppid(configParam.getAppId());
         config.setAppappid(configParam.getAppAppId());
         if (SecurityUtils.getClientId() != null) {
-            config.setCreateUserId(SecurityUtils.getUserId());
             if (clientService.findClientId()) {
                 config.setClientId(clientService.getClientId());
             } else {
                 config.setClientId(SecurityUtils.getUserId());
             }
+            config.setCreateUserId(SecurityUtils.getUserId());
         } else {
             config.setClientId(SecurityUtils.getUserId());
             config.setCreateUserId(SecurityUtils.getUserId());
@@ -145,6 +146,7 @@
                     wxConfigEntity.setAppappid(wxConfigEntity.getAppappid().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
                     wxConfigEntity.setMchId(wxConfigEntity.getMchId().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
                     wxConfigEntity.setPrivateKey(wxConfigEntity.getPrivateKey().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
+                    wxConfigEntity.setAppSecret(wxConfigEntity.getAppSecret().replaceAll("(?<=.{4}).*(?=.{4})", "*"));
                 }
         );
         return list;

--
Gitblit v1.9.3