调整jpa配置，去除多余无效引用，增加初始化钱包地址数量

crm-settlement/src/main/java/com/crm/settlement/config/AddressIdInitializer.java

@@ -0,0 +1,52 @@
+package com.crm.settlement.config;
+
+import com.crm.rely.backend.core.pojo.table.SysConfigTable;
+import com.crm.rely.backend.model.constant.ConfigConstants;
+import com.crm.rely.backend.service.RedisService;
+import com.crm.settlement.dao.repository.FinanceDepositAddressRepository;
+import com.crm.settlement.dao.repository.SysConfigRepository;
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author gao
+ * @date 2026/1/15
+ */
+@Component
+public class AddressIdInitializer {
+
+    @Autowired
+    private SysConfigRepository configRepository;
+    @Autowired
+    private FinanceDepositAddressRepository depositAddressRepository;
+    @Autowired
+    private RedisService redisService;
+
+    @PostConstruct
+    public void init() {
+        try {
+            // 读取配置值
+            SysConfigTable configTable = configRepository.getByCode(ConfigConstants.ADDRESS_ID_CONTROL_AUTO_NUMBER);
+            if (configTable == null) {
+                long count = depositAddressRepository.count();
+                configTable = new SysConfigTable();
+                configTable.setCode(ConfigConstants.ADDRESS_ID_CONTROL_AUTO_NUMBER);
+                configTable.setValue(String.valueOf(count));
+                configRepository.save(configTable);
+            } else if (configTable.getValue() == null) {
+                long count = depositAddressRepository.count();
+                configTable.setValue(String.valueOf(count));
+                configRepository.save(configTable);
+            }
+
+            // 初始化Redis自增值
+            redisService.saveObject(ConfigConstants.ADDRESS_ID_CONTROL_AUTO_NUMBER,
+                    Long.parseLong(configTable.getValue()));
+
+        } catch (Exception e) {
+            throw new RuntimeException("钱包地址数量初始化失败，系统启动中断", e);
+        }
+    }
+}

crm-settlement/src/main/java/com/crm/settlement/config/SettlementHttpConfig.java

@@ -1,20 +1,20 @@
-package com.crm.settlement.config;
-
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-import java.time.Duration;
-
-@Configuration
-public class SettlementHttpConfig {
-
-    @Bean
-    public RestTemplate restTemplate(RestTemplateBuilder builder) {
-        return builder
-                .setConnectTimeout(Duration.ofSeconds(10))
-                .setReadTimeout(Duration.ofSeconds(20))
-                .build();
-    }
-}
+//package com.crm.settlement.config;
+//
+//import org.springframework.boot.web.client.RestTemplateBuilder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.client.RestTemplate;
+//
+//import java.time.Duration;
+//
+//@Configuration
+//public class SettlementHttpConfig {
+//
+//    @Bean
+//    public RestTemplate restTemplate(RestTemplateBuilder builder) {
+//        return builder
+//                .setConnectTimeout(Duration.ofSeconds(10))
+//                .setReadTimeout(Duration.ofSeconds(20))
+//                .build();
+//    }
+//}

crm-settlement/src/main/java/com/crm/settlement/controller/VaultodyController.java

@@ -1,10 +1,7 @@
 package com.crm.settlement.controller;
 
 import com.crm.rely.backend.core.dto.base.BaseResultDto;
-import com.crm.rely.backend.model.entity.settlement.vaultody.VaultodyDepositRequestEntity;
-import com.crm.rely.backend.model.entity.settlement.vaultody.VaultodyWithdrawRequestEntity;
 import com.crm.settlement.service.VaultodyService;
-import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

crm-settlement/src/main/java/com/crm/settlement/service/SysConfigService.java

@@ -3,7 +3,6 @@ package com.crm.settlement.service;
 import com.crm.rely.backend.core.exception.ServiceException;
 import com.crm.rely.backend.core.pojo.table.SysConfigTable;
 
-import java.util.List;
 
 /**
  * @author gao

crm-settlement/src/main/java/com/crm/settlement/service/impl/SysConfigServiceImpl.java

@@ -9,10 +9,6 @@ import com.crm.settlement.dao.repository.SysConfigRepository;
 import com.crm.settlement.service.SysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Service
 public class SysConfigServiceImpl implements SysConfigService {

crm-settlement/src/main/java/com/crm/settlement/service/impl/SysSettlementConfigServiceImpl.java

@@ -48,5 +48,16 @@ public class SysSettlementConfigServiceImpl implements SysSettlementConfigServic
         return resultTable;
     }
 
+    public static void main(String[] args) {
+        String s = "xt4mA5tZi/4TcVck+5OPVL5to4cYAuqFtTJoyCVKl5elPCKNPYu+dGSNJOwAAqhc2SKBM0k9oxrGZJUxiNwnthSFoFAFQFP0bnWNR4E9oFZJv3xKhC8YlRWx3zd3Eed0L/Sxjm5u2vxgSLALJFxkHAxBc0GWjzcqtEIF1NRTMzMin9cV701GK6K6H9I/QbhMhQUIVh8ygcrR+wsxS2nYt6VF9GCviq4hSIXhmaSlAwrIVtvGjHST9VWdy5HsNFZHCfuSideRej3m9KE3Mz3Got7sig/dbhJ0Oj8Snl7MSLzo0Hz32+pS2vi11Uhbp9B36n1IayH9SH6BRqevJtqPvzJnDwsJN2dg8/VQulqbeFJ5bXpjFR+g808cFJzB8snVN8+LRE95PxrfPKUyzWOETgmCvGUAsKb0ixG6JFDzLa7jibXAehbVHD/tISZH6vLI71HxoSHlSE94IiAEuM9gLBCNPJVR1NaO34aKw+Yb93655YQe3A6Z5GhEiqwDMwhjzqAJaZ2qGp2OcAOJfwepb8KtiMVTKj+CBF1HXdTaI2wUgKwLYtQvWw9nYl+3RFHVTtgdD5QcHYBBeaSyuSb4D2s5nCuVmge8xH9Iz0FIWY7AI6RY7QlOGsRyuFFPI+89uZkLHcIJi3Q9itpkKfXXW4KO5YJl9mptWVhXC331KtO5lkhLSKS9jGcY3XnWjZ5Xra9z04q/MNVMRElHkSFWdwFoWkYQQYngih14Ody8IdhwMUdi81wT8c11Bq649xWqKetY7N6J4ndcNuQ8bHdNEz0kmMAGVd9NLHWpI/8lL+AAYyVDcFJaPOuBOQJZ9iHB/W7pjacAi/95lDrZWyD0tjPgReXp31efgfCnA8gR/Us=";
+        System.out.println(AESUtil.decrypt(s, "bfa5559109f94c78af615bcf00d52060"));
+        String ss = "{\n" +
+                "  \"privateKey\": \"MIIBVgIBADANBgkqhkiG9w0BAQEFAASCAUAwggE8AgEAAkEAprqtYRwj0Aw5WPEVF8xUov5/dFb48OnNRuVfBBA+itIwEOsnNsA5cUo+uMC03/WJfuFjMDiYMQ9dgfExrtSYmwIDAQABAkA2RViPXh4IKBp4qYzAoNnB7o5lO7QvkyMnGx1pELKS896CztGxeJ6oLtdIs2KE26mzxsAroFFCICna7rGtBWydAiEAzutOVTbjjSyYYlQRsqu1607ySnn/v/c5kcBRlHqj3QUCIQDORu2MJbIbEKYVNYH8eJCja5CbAJtq+W331TnFUymRHwIhALJj0UvMH5AVk2aqXfuw6AzvKholZeVlSd+rc2nT9bPVAiEAkOkTCFmS/aB8jHnCj3LDaYqvU7Theg0wS+LnatA5a1ECIQCEKe4vVViJqs4nXFvNM1I6zqw7KJUawtnjO3OGcL4NuQ==\",\n" +
+                "  \"merchantPublicKey\": \"MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKntL8BowACv+Yhe4PCCG61GR+bVxZuNhVYQs6M+gIYe0orac+7abhTy88NA7DOsQpodEwgEOHlGOGyfoV4uXDECAwEAAQ==\"\n" +
+                "}";
+        System.out.println(AESUtil.encrypt(ss, "bfa5559109f94c78af615bcf00d52060"));
+
+    }
+
 
 }

crm-settlement/src/main/java/com/crm/settlement/service/impl/VaultodyServiceImpl.java

@@ -18,7 +18,6 @@ import com.crm.rely.backend.util.MapUtil;
 import com.crm.rely.backend.model.constant.ConfigConstants;
 import com.crm.rely.backend.model.constant.SettlementConstant;
 import com.crm.rely.backend.model.dto.vaultody.TxResult;
-
 import com.crm.rely.backend.model.entity.property.vaultody.VaultodyPayPropertyEntity;
 import com.crm.rely.backend.model.entity.property.vaultody.VaultodyPayWithdrawAddressPropertyEntity;
 import com.crm.rely.backend.model.entity.property.vaultody.VaultodyPayWithdrawPropertyEntity;

crm-settlement/src/main/resources/application-dev.yml

@@ -8,6 +8,7 @@ spring:
     hibernate:
       ddl-auto: none
     show-sql: true
+    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MySQLDialect

crm-settlement/src/main/resources/application-prod.yml

@@ -8,6 +8,7 @@ spring:
     hibernate:
       ddl-auto: none
     show-sql: true
+    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MySQLDialect

crm-settlement/src/main/resources/application-test.yml

@@ -8,6 +8,7 @@ spring:
     hibernate:
       ddl-auto: none
     show-sql: true
+    open-in-view: false
     properties:
       hibernate:
         dialect: org.hibernate.dialect.MySQLDialect