From ec83a538cc3a5cca777a2f67902fb6949cd3b238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Mon, 5 Feb 2024 18:03:00 +0800
Subject: [PATCH] 123333

---
 ruoyi-admin/src/main/resources/application.yml              | 1 +
 .../src/main/java/com/ruoyi/cai/config/CaiProperties.java   | 1 +
 .../src/main/java/com/ruoyi/cai/pay/PayConfigManager.java   | 6 ++++++
 ruoyi-websocket-boot/src/main/resources/application.yml     | 6 +++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f0f768a4..a58baec8 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -242,6 +242,7 @@ lock4j:
   expire: 30000
 cai:
   enable-api-encryption: false
+  websocket: false
 --- # Actuator 监控端点的配置项
 management:
   endpoints:
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/config/CaiProperties.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/config/CaiProperties.java
index 0247c681..68823c9d 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/config/CaiProperties.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/config/CaiProperties.java
@@ -12,4 +12,5 @@ public class CaiProperties {
     private String homeName = "蜜瓜";
     private String coinName = "紫贝";
     private boolean enableApiEncryption = true;
+    private boolean websocket = true;
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java
index df31584b..19534062 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayConfigManager.java
@@ -3,6 +3,7 @@ package com.ruoyi.cai.pay;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ijpay.alipay.AliPayApiConfig;
 import com.ijpay.alipay.AliPayApiConfigKit;
+import com.ruoyi.cai.config.CaiProperties;
 import com.ruoyi.cai.domain.PayConfig;
 import com.ruoyi.cai.domain.PayTotal;
 import com.ruoyi.cai.service.PayConfigService;
@@ -24,9 +25,14 @@ public class PayConfigManager {
     private PayConfigService payConfigService;
     @Autowired
     private PayTotalService payTotalService;
+    @Autowired
+    private CaiProperties caiProperties;
 
     @PostConstruct
     public void init(){
+        if(caiProperties.isWebsocket()){
+            return;
+        }
         List<PayConfig> list = payConfigService.list(Wrappers.lambdaQuery(PayConfig.class));
         for (PayConfig payConfig : list) {
             PAY_CONFIGS_MAP.put(payConfig.getId(), payConfig);
diff --git a/ruoyi-websocket-boot/src/main/resources/application.yml b/ruoyi-websocket-boot/src/main/resources/application.yml
index 7e7fb455..e5034390 100644
--- a/ruoyi-websocket-boot/src/main/resources/application.yml
+++ b/ruoyi-websocket-boot/src/main/resources/application.yml
@@ -8,8 +8,6 @@ ruoyi:
   copyrightYear: 2023
   # 缓存懒加载
   cacheLazy: false
-  ser
-
 captcha:
   # 页面 <参数设置> 可开启关闭 验证码校验
   # 验证码类型 math 数组计算 char 字符验证
@@ -45,7 +43,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: @logging.level@
+    com.ruoyi: info
     org.springframework: warn
   config: classpath:logback-plus.xml
 
@@ -245,3 +243,5 @@ lock4j:
 management:
   endpoints:
     enabled-by-default: false
+cai:
+  websocket: true