From 182a2d6c43cb5dbd546c1db443701181eee341ca Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 27 Aug 2025 15:58:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=87=BA=E5=85=A5=E8=B4=A6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/m2pool/manage/M2ManageApplication.java    |  3 ++-
 .../m2pool/manage/config/AbstractMongoDbConfig.java    | 10 ----------
 .../java/com/m2pool/manage/config/MongoDbConfig.java   |  2 ++
 .../manage/service/impl/ManageUserServiceImpl.java     |  5 -----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/M2ManageApplication.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/M2ManageApplication.java
index 2e5d524..0de0444 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/M2ManageApplication.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/M2ManageApplication.java
@@ -6,6 +6,7 @@ import com.m2pool.common.swagger.annotation.EnableCustomSwagger2;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.client.RestTemplate;
 
@@ -17,7 +18,7 @@ import org.springframework.web.client.RestTemplate;
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableM2PoolFeignClients
-@SpringBootApplication
+@SpringBootApplication(exclude = {MongoAutoConfiguration.class})
 @MapperScan({"com.m2pool.manage.mapper"})
 public class M2ManageApplication {
     @Bean
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java
index d51351c..e745efc 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/AbstractMongoDbConfig.java
@@ -12,16 +12,6 @@ import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
  */
 @Data
 public abstract class AbstractMongoDbConfig {
-    private String host;
-    private String port;
-    private String username;
-    private String password;
-    private String database;
-    public MongoDatabaseFactory mongoDatabaseFactory() {
-        String connectionString = "mongodb://" + username + ":" + password+ "@"+ host+":"+port +"/" + database;
-        return new SimpleMongoClientDatabaseFactory(connectionString);
-    }
-
     public MongoDatabaseFactory mongoDatabaseNoUserFactory(String host, String port, String database) {
         String connectionString = "mongodb://"+ host+":"+port +"/" + database;
         return new SimpleMongoClientDatabaseFactory(connectionString);
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java
index adfafab..b508ad8 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/config/MongoDbConfig.java
@@ -2,6 +2,7 @@ package com.m2pool.manage.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -14,6 +15,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
  */
 @Data
 @Configuration
+@RefreshScope
 @ConfigurationProperties("spring.data.mongodb.documentation")
 public class MongoDbConfig  extends AbstractMongoDbConfig{
 
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
index c0f62ea..ab6864d 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
@@ -129,11 +129,6 @@ public class ManageUserServiceImpl implements ManageUserService {
             powerUnit = new PowerUnitUtils.NetPowerUnit("GH/S", BigDecimal.valueOf(1000 * 1000 * 1000));
         }
         changeUnit(powerUnit, list,BigDecimal.valueOf(1000 * 1000));
-        if (manageMiningUserPowerVo.getStartDate()==null || manageMiningUserPowerVo.getEndDate()==null){
-
-        }
-
-
         Date endDate = manageMiningUserPowerVo.getEndDate();
         Date startDate = manageMiningUserPowerVo.getStartDate();
         if (manageMiningUserPowerVo.getStartDate()==null || manageMiningUserPowerVo.getEndDate()==null){